Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-10 03:54:58 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-10 03:54:58 +0400
commit7d03e5c615a71fea9223d4fa4fb3bf4e98190c8c (patch)
tree01185f99ff6e3cfbaa2a6e4f968809f645daf1bb /source/blender/editors/render
parent5a29885007c66752adbdcd62cdac5e7749f083fd (diff)
Fix part of #33132: render resoltuion refresh issues after persistent images
was added for cycles. This fixes the case where the option is disabled. I moved the option now to Blender itself and made it keep the engine around only when it's enabled. Also fixes case where there could be issues when switching to another renderer.
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r--source/blender/editors/render/render_update.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c
index 0a2ca379518..5155f1001ab 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -58,6 +58,7 @@
#include "GPU_material.h"
#include "RE_engine.h"
+#include "RE_pipeline.h"
#include "ED_node.h"
#include "ED_render.h"
@@ -157,6 +158,8 @@ void ED_render_engine_changed(Main *bmain)
for (sc = bmain->screen.first; sc; sc = sc->id.next)
for (sa = sc->areabase.first; sa; sa = sa->next)
ED_render_engine_area_exit(sa);
+
+ RE_FreePersistentData();
}
/***************************** Updates ***********************************