[Bf-blender-cvs] [fa5837c5e86] master: Cleanup: remove unused RenderData.displaymode

Campbell Barton noreply at git.blender.org
Sat Feb 15 05:31:42 CET 2020


Commit: fa5837c5e8643ac68485ca7c10dd503c129a2d2f
Author: Campbell Barton
Date:   Sat Feb 15 12:09:03 2020 +1100
Branches: master
https://developer.blender.org/rBfa5837c5e8643ac68485ca7c10dd503c129a2d2f

Cleanup: remove unused RenderData.displaymode

===================================================================

M	source/blender/blenloader/intern/versioning_defaults.c
M	source/blender/editors/render/render_opengl.c
M	source/blender/makesdna/DNA_scene_defaults.h
M	source/blender/makesdna/DNA_scene_types.h

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 446cfa4163f..41bf2dfe578 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -286,7 +286,6 @@ static void blo_update_defaults_scene(Main *bmain, Scene *scene)
   BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(scene->r.engine));
 
   scene->r.cfra = 1.0f;
-  scene->r.displaymode = R_OUTPUT_WINDOW;
 
   /* Don't enable compositing nodes. */
   if (scene->nodetree) {
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index a434ecad48d..be9c433fc83 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -1271,7 +1271,7 @@ static int screen_opengl_render_invoke(bContext *C, wmOperator *op, const wmEven
   oglrender = op->customdata;
   render_view_open(C, event->x, event->y, op->reports);
 
-  /* view may be changed above (R_OUTPUT_WINDOW) */
+  /* View may be changed above #USER_RENDER_DISPLAY_WINDOW. */
   oglrender->win = CTX_wm_window(C);
 
   WM_event_add_modal_handler(C, op);
diff --git a/source/blender/makesdna/DNA_scene_defaults.h b/source/blender/makesdna/DNA_scene_defaults.h
index 0b0cb8b14f3..db3566710b4 100644
--- a/source/blender/makesdna/DNA_scene_defaults.h
+++ b/source/blender/makesdna/DNA_scene_defaults.h
@@ -85,7 +85,6 @@
  \
     .im_format = _DNA_DEFAULT_ImageFormatData, \
  \
-    .displaymode = R_OUTPUT_WINDOW, \
     .framapto = 100, \
     .images = 100, \
     .framelen = 1.0, \
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 9cb2663386a..ca973bf6120 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -658,9 +658,8 @@ typedef struct RenderData {
   /**
    * Render to image editor, fullscreen or to new window.
    */
-  short displaymode;
   char use_lock_interface;
-  char _pad7;
+  char _pad7[3];
 
   /**
    * Flags for render settings. Use bit-masking to access the settings.
@@ -1853,13 +1852,6 @@ enum {
   R_SEQ_OVERRIDE_SCENE_SETTINGS = (1 << 5),
 };
 
-/** #RenderData.displaymode */
-#define R_OUTPUT_SCREEN 0
-#define R_OUTPUT_AREA 1
-#define R_OUTPUT_WINDOW 2
-#define R_OUTPUT_NONE 3
-/*#define R_OUTPUT_FORKED   4*/
-
 /** #RenderData.filtertype (used for nodes) */
 #define R_FILTER_BOX 0
 #define R_FILTER_TENT 1



More information about the Bf-blender-cvs mailing list