svn merge ^/trunk/blender -r48415:48469
authorCampbell Barton <ideasman42@gmail.com>
Sun, 1 Jul 2012 15:39:02 +0000 (15:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 1 Jul 2012 15:39:02 +0000 (15:39 +0000)
commit5a803b7edf7cacc6a059d3e51f381d2783a5a005
tree1f5d2c20a0476282a154440417e5c977d708ef56
parent148fdb3a7a4e85fb50db52eec6673b9a501c022b
parent7d223a1d14bf18e296c012df7dd36869957ccd80
svn merge ^/trunk/blender -r48415:48469
CMakeLists.txt
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-vc-config.py
build_files/scons/tools/btools.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_node/space_node.c
source/blender/imbuf/IMB_imbuf_types.h
source/blender/imbuf/intern/allocimbuf.c
source/blender/nodes/CMakeLists.txt
source/creator/CMakeLists.txt