svn merge ^/trunk/blender -r55594:55635
authorCampbell Barton <ideasman42@gmail.com>
Wed, 27 Mar 2013 22:24:38 +0000 (22:24 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 27 Mar 2013 22:24:38 +0000 (22:24 +0000)
commitf13829c7826e61c14d78f20bd347228f01367706
treeb4ccd417411dbbcef50187169a285ce5953578af
parent765a10a8cdaa09ba7ffb06139c05255948d41518
parentd15d78a33a8df76b02fa0d27dacd85c8a77ec109
svn merge ^/trunk/blender -r55594:55635
13 files changed:
CMakeLists.txt
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/CMakeLists.txt
source/blender/editors/render/CMakeLists.txt
source/blender/editors/render/SConscript
source/blender/editors/render/render_shading.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/pipeline.c