diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-21 12:24:29 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-21 12:26:42 +0300 |
| commit | b0df19667fa30ad80631da86198710981ca03824 (patch) | |
| tree | cffb147212139a4411e5c1974568064400f2d4a6 | |
| parent | b23c6c430f9c405bab22fc8cd19b7c7916a29f71 (diff) | |
Fix T45317: Cycles material preview unnecessarily re-rendering
The issue was caused by wrong fix for T22741 which forced redraws on any window
event, like Expose. Use proper NV_WM | ND_UNDO listener instead,
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index f1296541e2b..46d5b3c3684 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -1406,7 +1406,6 @@ void PointDensityTextureNode::compile(SVMCompiler& compiler) void PointDensityTextureNode::compile(OSLCompiler& compiler) { - ShaderInput *vector_in = input("Vector"); ShaderOutput *density_out = output("Density"); ShaderOutput *color_out = output("Color"); diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 6704431c705..e28ad686d2a 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -371,9 +371,11 @@ static void buttons_area_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier * } break; /* Listener for preview render, when doing an global undo. */ - case NC_WINDOW: - ED_area_tag_redraw(sa); - sbuts->preview = 1; + case NC_WM: + if (wmn->data == ND_UNDO) { + ED_area_tag_redraw(sa); + sbuts->preview = 1; + } break; #ifdef WITH_FREESTYLE case NC_LINESTYLE: |