Merging r49463 through r49478 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 1 Aug 2012 19:23:50 +0000 (19:23 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 1 Aug 2012 19:23:50 +0000 (19:23 +0000)
commitccf0b13fdc8c80cd24f6c68a6b4fbf44284a828d
tree7d7610465a4d1c3e82b87c9be0f270b00631e5ed
parent0f6eb8c2cd0750f7a8af290ea574ce7306356228
parent6a6bcea81765976e902a4bac99ff9cbcd0faed55
Merging r49463 through r49478 from trunk into soc-2011-tomato
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/render_internal.c
source/blender/editors/space_node/node_intern.h
source/blender/makesrna/intern/rna_scene.c