svn merge ^/trunk/blender -r48585:48604
authorCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jul 2012 17:55:30 +0000 (17:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jul 2012 17:55:30 +0000 (17:55 +0000)
commit48d0d32f7395d772f6ac9e59ecc40845abab2175
tree2a3103ed5d5abcf43ac0d4f131537cf90e0b8363
parent438b77e5d4a6f64be95c3162cbde4738548f7ead
parent958cf139f6587df631944f6ec0fcb4111c7e58fa
svn merge ^/trunk/blender -r48585:48604
CMakeLists.txt
source/blender/compositor/CMakeLists.txt
source/blender/compositor/intern/COM_Converter.cpp
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_wm.c