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>2013-05-15 21:09:45 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-15 21:09:45 +0400
commita4b5c05aadf5a258fdc4e52596e20c9ca88607f2 (patch)
tree943b67375877e911750c796841e1f878bb1f66d0 /source/blender/makesdna
parent845376e8d35b99acd4ae1f5a0756e2c83085423a (diff)
Fixes for blender internal viewport render:
* Particles did not render at viewport resolution like meshes. * Properties editor preview render of hair was crashing, solution is to have two separate flags for this preview render and viewport preview render.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_scene_types.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index eb8c8138e85..bc911f9addc 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1300,7 +1300,7 @@ typedef struct Scene {
#define R_BG_RENDER 0x0002
/* passepartout is camera option now, keep this for backward compatibility */
#define R_PASSEPARTOUT 0x0004
-#define R_PREVIEWBUTS 0x0008
+#define R_BUTS_PREVIEW 0x0008
#define R_EXTENSION 0x0010
#define R_MATNODE_PREVIEW 0x0020
#define R_DOCOMP 0x0040
@@ -1316,6 +1316,7 @@ typedef struct Scene {
/* #define R_DEPRECATED 0x10000 */
/* #define R_RECURS_PROTECTION 0x20000 */
#define R_TEXNODE_PREVIEW 0x40000
+#define R_VIEWPORT_PREVIEW 0x80000
/* r->stamp */
#define R_STAMP_TIME 0x0001