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.

3 files changed, 3 insertions, 8 deletions

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 32b07f47ba8..0b8ca6e0fbe 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -297,12 +297,6 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
                 default=False,
                 )
 
-        cls.use_persistent_images = BoolProperty(
-                name="Persistent Images",
-                description="Keep images loaded on the device so they could be reused by next render",
-                default=False,
-                )
-
     @classmethod
     def unregister(cls):
         del bpy.types.Scene.cycles
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 9ecd0d3e252..4a651eb5aab 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -218,7 +218,7 @@ class CyclesRender_PT_performance(CyclesButtonsPanel, Panel):
 
         sub = col.column(align=True)
         sub.label(text="Final Render:")
-        sub.prop(cscene, "use_persistent_images")
+        sub.prop(rd, "use_persistent_data", text="Persistent Images")
 
 
 class CyclesRender_PT_layers(CyclesButtonsPanel, Panel):
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index ce589f55e60..9ebdcfd04bd 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -284,6 +284,7 @@ void BlenderSync::sync_render_layers(BL::SpaceView3D b_v3d, const char *layer)
 
 SceneParams BlenderSync::get_scene_params(BL::Scene b_scene, bool background)
 {
+	BL::RenderSettings r = b_scene.render();
 	SceneParams params;
 	PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
 	int shadingsystem = RNA_enum_get(&cscene, "shading_system");
@@ -301,7 +302,7 @@ SceneParams BlenderSync::get_scene_params(BL::Scene b_scene, bool background)
 	params.use_bvh_spatial_split = RNA_boolean_get(&cscene, "debug_use_spatial_splits");
 	params.use_bvh_cache = (background)? RNA_boolean_get(&cscene, "use_cache"): false;
 
-	params.persistent_images = (background)? RNA_boolean_get(&cscene, "use_persistent_images"): false;
+	params.persistent_images = (background)? r.use_persistent_data(): false;
 
 	return params;
 }