svn merge ^/trunk/blender -r48674:48681
authorCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2012 14:25:49 +0000 (14:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2012 14:25:49 +0000 (14:25 +0000)
commitec233cd747c464f3141cc4a1f58481170e4efadc
treedce2591e6131dc1b86c6792ae18b98cd9eea5821
parentd1c335ad790c885ccff97c69eeb023eef8fc8e59
parent5f792b08e4115e4231f92f67cdc5ffde50473055
svn merge ^/trunk/blender -r48674:48681
SConstruct
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/intern/source/external_engine.c