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)
1  2 
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