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)
commit75a4832af3cf1c5edb23f9816b290d6c5f61a64c
tree7d18f8384b9219300a42f5a357ddd4a8f17c13b1
parent3f31145d2971d973d401878e9223de44ef3952fe
parent1aadbdedc748c1bc63b1ffa25793858a06c4ba21
svn merge ^/trunk/blender -r43676:43685
source/blender/blenkernel/intern/particle_system.c
source/blender/makesrna/intern/rna_object_api.c