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/makesdna/DNA_scene_types.h
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/makesdna/DNA_scene_types.h')
-rw-r--r--source/blender/makesdna/DNA_scene_types.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 1479d5268ed..251e6a7eb4e 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1187,11 +1187,12 @@ typedef struct Scene {
/* Use the same flag for autothreads */
#define R_FIXED_THREADS 0x80000
-#define R_SPEED 0x100000
-#define R_SSS 0x200000
-#define R_NO_OVERWRITE 0x400000 /* skip existing files */
-#define R_TOUCH 0x800000 /* touch files before rendering */
-#define R_SIMPLIFY 0x1000000
+#define R_SPEED 0x100000
+#define R_SSS 0x200000
+#define R_NO_OVERWRITE 0x400000 /* skip existing files */
+#define R_TOUCH 0x800000 /* touch files before rendering */
+#define R_SIMPLIFY 0x1000000
+#define R_PERSISTENT_DATA 0x2000000 /* keep data around for re-render */
/* seq_flag */
#define R_SEQ_GL_PREV 1