diff options
author | Jeroen Bakker <jeroen@blender.org> | 2020-03-06 14:08:03 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-03-06 14:11:55 +0300 |
commit | 297261eb906c56c7decf4401e6a3e06cec1691e8 (patch) | |
tree | f9833fb55af46edc0bc3849cffeb2dee83a3c6c9 /source/blender/editors/render | |
parent | 9fa29fe7652a9adc4a11ba3dc2975595489f7bcd (diff) |
CodeCleanup: Added enums to opengl render functions
Motivation the functions get 3 different kind of flag parameters (ImBuf,
DrawType, OffscreenRendering) the naming of the flags were not clear,
leading to mistakes and unnecessary time spend debugging.
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index f212eb07e2e..add023fe57a 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -67,6 +67,7 @@ #include "ED_screen.h" #include "ED_view3d.h" +#include "ED_view3d_offscreen.h" #include "ED_gpencil.h" #include "RE_pipeline.h" @@ -368,7 +369,8 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R char err_out[256] = "unknown"; ImBuf *ibuf_view; const int alpha_mode = (draw_sky) ? R_ADDSKY : R_ALPHAPREMUL; - int output_flags = oglrender->color_depth <= R_IMF_CHAN_DEPTH_8 ? IB_rect : IB_rectfloat; + eImBufFlags imbuf_flags = oglrender->color_depth <= R_IMF_CHAN_DEPTH_8 ? IB_rect : + IB_rectfloat; if (view_context) { ibuf_view = ED_view3d_draw_offscreen_imbuf(depsgraph, @@ -378,7 +380,7 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R ar, sizex, sizey, - output_flags, + imbuf_flags, alpha_mode, viewname, oglrender->ofs, @@ -397,7 +399,7 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R scene->camera, oglrender->sizex, oglrender->sizey, - output_flags, + imbuf_flags, V3D_OFSDRAW_SHOW_ANNOTATION, alpha_mode, viewname, @@ -1382,6 +1384,3 @@ void RENDER_OT_opengl(wmOperatorType *ot) "Use the current 3D view for rendering, else use scene settings"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); } - -/* function for getting an opengl buffer from a View3D, used by sequencer */ -// extern void *sequencer_view3d_cb; |