diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-23 16:33:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-23 16:33:11 +0400 |
commit | 094ab4af034a94402a73c2f661dde600cd3ee334 (patch) | |
tree | ef142e8f0d16ffd384d17fa32dcb2b48877fcb1d /source/blender/editors/space_node/space_node.c | |
parent | dc907ef876b128c9767394d00dfc719d55ba077e (diff) | |
parent | 4ea8cb25295d0e61a1fcf1cd16028a3586ed5921 (diff) |
Merge fixes from trunk into 2.60a tag:v2.60a
svn merge ^/trunk/blender \
-c41113 \
-c41117 \
-c41128 \
-c41132 \
-c41134 \
-c41151 \
-c41152 \
-c41175 \
-c41197 \
-c41203 \
-c41211 \
-c41214 \
-c41219
Diffstat (limited to 'source/blender/editors/space_node/space_node.c')
-rw-r--r-- | source/blender/editors/space_node/space_node.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 9c4581a43da..85cfffed664 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -214,6 +214,12 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn) ED_area_tag_refresh(sa); } break; + case NC_OBJECT: + if(type==NTREE_SHADER) { + if(wmn->data==ND_OB_SHADING) + ED_area_tag_refresh(sa); + } + break; case NC_TEXT: /* pynodes */ if(wmn->data==ND_SHADING) |