diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-01-31 18:35:24 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-01-31 18:35:24 +0300 |
| commit | 90f8fb733bfed6cd1b56b2fed30c4325c5c65cf0 (patch) | |
| tree | 104e286770456a335ddf5966a5697a119b533b3d /source/blender/src/header_node.c | |
| parent | 134fdd6d5a2ef07025a58325bc10efe62a87b269 (diff) | |
Fix: render could crash when you enable 'do composite' without having
nodes in scene.
Feature: SHIFT+R in compositor reloads all full sample buffers, composites
and merges with filter. (ALso in Node menu).
Diffstat (limited to 'source/blender/src/header_node.c')
| -rw-r--r-- | source/blender/src/header_node.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/src/header_node.c b/source/blender/src/header_node.c index a00cbd1290b..39012f6addc 100644 --- a/source/blender/src/header_node.c +++ b/source/blender/src/header_node.c @@ -519,6 +519,10 @@ static void do_node_nodemenu(void *arg, int event) case 12: /* rename */ node_rename(snode); break; + case 13: /* read saved full sample layers */ + node_read_fullsamplelayers(snode); + break; + } if(fromlib==-1) error_libdata(); @@ -562,6 +566,7 @@ static uiBlock *node_nodemenu(void *arg_unused) if(snode->treetype==NTREE_COMPOSIT) { uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Execute Composite|E", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 10, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Read Saved Render Results|R", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 8, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Read Saved Full Sample Results|R", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, ""); } uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Cyclic Dependencies|C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, ""); |