diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-02-03 01:35:23 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-02-03 01:35:23 +0300 |
| commit | d8ae1c93f33dbbf20e0f2f172bb16c540d4cb98e (patch) | |
| tree | 8757c101fe974a0536daccd49996ffa041471b9c /source | |
| parent | b43ddb4dec8abe9b891b69cd89eb139422881638 (diff) | |
Accidentally committed without log...
This commit removes old preview-image signals for Compositor, this was
obsolete when event-based updates were added, and was still causing
recalculations for example on loading files.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/drawnode.c | 2 | ||||
| -rw-r--r-- | source/blender/src/editnode.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/src/drawnode.c b/source/blender/src/drawnode.c index a2697aa559d..9dc00c18065 100644 --- a/source/blender/src/drawnode.c +++ b/source/blender/src/drawnode.c @@ -571,7 +571,7 @@ static void node_browse_image_cb(void *ntree_v, void *node_v) BLI_strncpy(node->name, node->id->name+2, 21); - addqueue(curarea->win, RENDERPREVIEW, 1); + NodeTagChanged(ntree, node); } node->menunr= 0; } diff --git a/source/blender/src/editnode.c b/source/blender/src/editnode.c index 19036c64d14..5330531d32a 100644 --- a/source/blender/src/editnode.c +++ b/source/blender/src/editnode.c @@ -189,8 +189,9 @@ static void load_node_image(char *str) /* called from fileselect */ free_image_buffers(ima); /* force read again */ ima->ok= 1; - addqueue(curarea->win, RENDERPREVIEW, 1); - allqueue(REDRAWNODE, 0); + NodeTagChanged(snode->edittree, node); + snode_handle_recalc(snode); + allqueue(REDRAWNODE, 0); } } @@ -223,6 +224,7 @@ static void composit_node_event(SpaceNode *snode, short event) else strcpy(name, U.textudir); activate_fileselect(FILE_SPECIAL, "SELECT IMAGE", name, load_node_image); + break; } case B_NODE_TREE_EXEC: snode_handle_recalc(snode); @@ -236,8 +238,8 @@ static void composit_node_event(SpaceNode *snode, short event) node= snode_get_editgroup(snode); if(node) NodeTagChanged(snode->nodetree, node); + snode_handle_recalc(snode); } - snode_handle_recalc(snode); } } } @@ -1669,8 +1671,6 @@ void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt) case RENDERPREVIEW: if(snode->treetype==NTREE_SHADER) shader_node_previewrender(sa, snode); - else if(snode->treetype==NTREE_COMPOSIT) - snode_handle_recalc(snode); break; case PADPLUSKEY: |