Cleanup: remove unused RenderData.displaymode
This commit is contained in:
parent
52da1b6e2b
commit
fa5837c5e8
|
@ -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));
|
BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(scene->r.engine));
|
||||||
|
|
||||||
scene->r.cfra = 1.0f;
|
scene->r.cfra = 1.0f;
|
||||||
scene->r.displaymode = R_OUTPUT_WINDOW;
|
|
||||||
|
|
||||||
/* Don't enable compositing nodes. */
|
/* Don't enable compositing nodes. */
|
||||||
if (scene->nodetree) {
|
if (scene->nodetree) {
|
||||||
|
|
|
@ -1271,7 +1271,7 @@ static int screen_opengl_render_invoke(bContext *C, wmOperator *op, const wmEven
|
||||||
oglrender = op->customdata;
|
oglrender = op->customdata;
|
||||||
render_view_open(C, event->x, event->y, op->reports);
|
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);
|
oglrender->win = CTX_wm_window(C);
|
||||||
|
|
||||||
WM_event_add_modal_handler(C, op);
|
WM_event_add_modal_handler(C, op);
|
||||||
|
|
|
@ -85,7 +85,6 @@
|
||||||
\
|
\
|
||||||
.im_format = _DNA_DEFAULT_ImageFormatData, \
|
.im_format = _DNA_DEFAULT_ImageFormatData, \
|
||||||
\
|
\
|
||||||
.displaymode = R_OUTPUT_WINDOW, \
|
|
||||||
.framapto = 100, \
|
.framapto = 100, \
|
||||||
.images = 100, \
|
.images = 100, \
|
||||||
.framelen = 1.0, \
|
.framelen = 1.0, \
|
||||||
|
|
|
@ -658,9 +658,8 @@ typedef struct RenderData {
|
||||||
/**
|
/**
|
||||||
* Render to image editor, fullscreen or to new window.
|
* Render to image editor, fullscreen or to new window.
|
||||||
*/
|
*/
|
||||||
short displaymode;
|
|
||||||
char use_lock_interface;
|
char use_lock_interface;
|
||||||
char _pad7;
|
char _pad7[3];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Flags for render settings. Use bit-masking to access the settings.
|
* Flags for render settings. Use bit-masking to access the settings.
|
||||||
|
@ -1853,13 +1852,6 @@ enum {
|
||||||
R_SEQ_OVERRIDE_SCENE_SETTINGS = (1 << 5),
|
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) */
|
/** #RenderData.filtertype (used for nodes) */
|
||||||
#define R_FILTER_BOX 0
|
#define R_FILTER_BOX 0
|
||||||
#define R_FILTER_TENT 1
|
#define R_FILTER_TENT 1
|
||||||
|
|
Loading…
Reference in New Issue