svn merge -r37030:37035 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 May 2011 06:39:57 +0000 (06:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 May 2011 06:39:57 +0000 (06:39 +0000)
commit9d2abb445a02b9978a52ba7d56ae8cdcbb4f4c38
tree87d8a6eccfe118850585ae59dba62f1b3f4be802
parent8949387186ef59bd0ba28cfe0c0e14a3ab5ac2d6
parent348f947d8030d9895005ae3bb927a744d05a585d
svn merge -r37030:37035 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_nla.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_boolean.c