svn merge ^/trunk/blender -r43676:43685
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jan 2012 22:44:48 +0000 (22:44 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jan 2012 22:44:48 +0000 (22:44 +0000)
1  2 
source/blender/blenkernel/intern/particle_system.c
source/blender/makesrna/intern/rna_object_api.c