svn merge ^/trunk/blender -r42426:42439
authorCampbell Barton <ideasman42@gmail.com>
Mon, 5 Dec 2011 17:54:33 +0000 (17:54 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 5 Dec 2011 17:54:33 +0000 (17:54 +0000)
commitd97f88d2786ec78df321980cd333408648bd4419
tree08c93875b62f1eadf4fe876a80817d896002930c
parent824bfa98c3a8350dc9030907d9ad6a5ec5919945
parentc40d8921b8b61c0465a2fe9bca72dc418bf39c7d
svn merge ^/trunk/blender -r42426:42439
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_object_api.c