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
path: root/source/blender/editors/render/render_opengl.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/render/render_opengl.c')
-rw-r--r--source/blender/editors/render/render_opengl.c264
1 files changed, 152 insertions, 112 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 26996893ae5..180e72c8cd7 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -50,6 +50,7 @@
#include "BKE_main.h"
#include "BKE_report.h"
#include "BKE_scene.h"
+#include "BKE_sequencer.h"
#include "BKE_writeavi.h"
#include "WM_api.h"
@@ -87,6 +88,10 @@ typedef struct OGLRender {
short obcenter_dia_back; /* temp overwrite */
+ short is_sequencer;
+ SpaceSeq *sseq;
+
+
Image *ima;
ImageUser iuser;
@@ -114,28 +119,48 @@ static unsigned int screen_opengl_layers(OGLRender *oglrender)
static void screen_opengl_render_apply(OGLRender *oglrender)
{
- Scene *scene= oglrender->scene;
- ARegion *ar= oglrender->ar;
- View3D *v3d= oglrender->v3d;
- RegionView3D *rv3d= oglrender->rv3d;
+ Scene *scene = oglrender->scene;
+ ARegion *ar = oglrender->ar;
+ View3D *v3d = oglrender->v3d;
+ RegionView3D *rv3d = oglrender->rv3d;
RenderResult *rr;
- Object *camera= NULL;
+ Object *camera = NULL;
ImBuf *ibuf;
void *lock;
float winmat[4][4];
- int sizex= oglrender->sizex;
- int sizey= oglrender->sizey;
- const short view_context= (v3d != NULL);
+ int sizex = oglrender->sizex;
+ int sizey = oglrender->sizey;
+ const short view_context = (v3d != NULL);
- rr= RE_AcquireResultRead(oglrender->re);
-
- if (view_context) {
+ rr = RE_AcquireResultRead(oglrender->re);
+
+ if (oglrender->is_sequencer) {
+ SeqRenderData context;
+ int chanshown = oglrender->sseq ? oglrender->sseq->chanshown : 0;
+
+ context = seq_new_render_data(oglrender->bmain, scene, oglrender->sizex, oglrender->sizey, 100.0f);
+
+ ibuf = give_ibuf_seq(context, CFRA, chanshown);
+
+ if (ibuf) {
+ BLI_assert((oglrender->sizex == ibuf->x) && (oglrender->sizey == ibuf->y));
+
+ if (ibuf->rect_float == NULL) {
+ IMB_float_from_rect(ibuf);
+ }
+
+ memcpy(rr->rectf, ibuf->rect_float, sizeof(float) * 4 * oglrender->sizex * oglrender->sizey);
+
+ IMB_freeImBuf(ibuf);
+ }
+ }
+ else if (view_context) {
GPU_offscreen_bind(oglrender->ofs); /* bind */
/* render 3d view */
- if (rv3d->persp==RV3D_CAMOB && v3d->camera) {
+ if (rv3d->persp == RV3D_CAMOB && v3d->camera) {
/*int is_ortho= scene->r.mode & R_ORTHO;*/
- camera= v3d->camera;
+ camera = v3d->camera;
RE_GetCameraWindow(oglrender->re, camera, scene->r.cfra, winmat);
}
@@ -143,9 +168,9 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
rctf viewplane;
float clipsta, clipend;
- int is_ortho= ED_view3d_viewplane_get(v3d, rv3d, sizex, sizey, &viewplane, &clipsta, &clipend);
+ int is_ortho = ED_view3d_viewplane_get(v3d, rv3d, sizex, sizey, &viewplane, &clipsta, &clipend);
if (is_ortho) orthographic_m4(winmat, viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, -clipend, clipend);
- else perspective_m4(winmat, viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, clipsta, clipend);
+ else perspective_m4(winmat, viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, clipsta, clipend);
}
if ((scene->r.mode & R_OSA) == 0) {
@@ -156,8 +181,8 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
/* simple accumulation, less hassle then FSAA FBO's */
static float jit_ofs[32][2];
float winmat_jitter[4][4];
- float *accum_buffer= MEM_mallocN(sizex * sizey * sizeof(float) * 4, "accum1");
- float *accum_tmp= MEM_mallocN(sizex * sizey * sizeof(float) * 4, "accum2");
+ float *accum_buffer = MEM_mallocN(sizex * sizey * sizeof(float) * 4, "accum1");
+ float *accum_tmp = MEM_mallocN(sizex * sizey * sizeof(float) * 4, "accum2");
int j;
BLI_initjit(jit_ofs[0], scene->r.osa);
@@ -167,7 +192,7 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
GPU_offscreen_read_pixels(oglrender->ofs, GL_FLOAT, accum_buffer);
/* skip the first sample */
- for (j=1; j < scene->r.osa; j++) {
+ for (j = 1; j < scene->r.osa; j++) {
copy_m4_m4(winmat_jitter, winmat);
window_translate_m4(winmat_jitter, rv3d->persmat,
(jit_ofs[j][0] * 2.0f) / sizex,
@@ -175,10 +200,10 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
ED_view3d_draw_offscreen(scene, v3d, ar, sizex, sizey, NULL, winmat_jitter, TRUE);
GPU_offscreen_read_pixels(oglrender->ofs, GL_FLOAT, accum_tmp);
- add_vn_vn(accum_buffer, accum_tmp, sizex*sizey*sizeof(float));
+ add_vn_vn(accum_buffer, accum_tmp, sizex * sizey * sizeof(float));
}
- mul_vn_vn_fl(rr->rectf, accum_buffer, sizex*sizey*sizeof(float), 1.0f / scene->r.osa);
+ mul_vn_vn_fl(rr->rectf, accum_buffer, sizex * sizey * sizeof(float), 1.0f / scene->r.osa);
MEM_freeN(accum_buffer);
MEM_freeN(accum_tmp);
@@ -188,16 +213,16 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
}
else {
/* shouldnt suddenly give errors mid-render but possible */
- char err_out[256]= "unknown";
- ImBuf *ibuf_view= ED_view3d_draw_offscreen_imbuf_simple(scene, scene->camera, oglrender->sizex, oglrender->sizey, IB_rectfloat, OB_SOLID, TRUE, err_out);
- camera= scene->camera;
+ char err_out[256] = "unknown";
+ ImBuf *ibuf_view = ED_view3d_draw_offscreen_imbuf_simple(scene, scene->camera, oglrender->sizex, oglrender->sizey, IB_rectfloat, OB_SOLID, TRUE, err_out);
+ camera = scene->camera;
if (ibuf_view) {
memcpy(rr->rectf, ibuf_view->rect_float, sizeof(float) * 4 * oglrender->sizex * oglrender->sizey);
IMB_freeImBuf(ibuf_view);
}
else {
- fprintf(stderr, "screen_opengl_render_apply: failed to get buffer, %s\n", err_out);
+ fprintf(stderr, "%s: failed to get buffer, %s\n", __func__, err_out);
}
}
@@ -215,17 +240,17 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
* float buffer. */
if (oglrender->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) {
- int predivide= 0; /* no alpha */
+ int predivide = 0; /* no alpha */
IMB_buffer_float_from_float(rr->rectf, rr->rectf,
- 4, IB_PROFILE_LINEAR_RGB, IB_PROFILE_SRGB, predivide,
- oglrender->sizex, oglrender->sizey, oglrender->sizex, oglrender->sizex);
+ 4, IB_PROFILE_LINEAR_RGB, IB_PROFILE_SRGB, predivide,
+ oglrender->sizex, oglrender->sizey, oglrender->sizex, oglrender->sizex);
}
RE_ReleaseResult(oglrender->re);
/* update byte from float buffer */
- ibuf= BKE_image_acquire_ibuf(oglrender->ima, &oglrender->iuser, &lock);
+ ibuf = BKE_image_acquire_ibuf(oglrender->ima, &oglrender->iuser, &lock);
if (ibuf) {
image_buffer_rect_update(scene, rr, ibuf, NULL);
@@ -239,9 +264,9 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
}
BKE_makepicstring(name, scene->r.pic, oglrender->bmain->name, scene->r.cfra, scene->r.im_format.imtype, scene->r.scemode & R_EXTENSION, FALSE);
- ok= BKE_write_ibuf_as(ibuf, name, &scene->r.im_format, TRUE); /* no need to stamp here */
- if (ok) printf("OpenGL Render written to '%s'\n", name);
- else printf("OpenGL Render failed to write '%s'\n", name);
+ ok = BKE_write_ibuf_as(ibuf, name, &scene->r.im_format, TRUE); /* no need to stamp here */
+ if (ok) printf("OpenGL Render written to '%s'\n", name);
+ else printf("OpenGL Render failed to write '%s'\n", name);
}
}
@@ -251,17 +276,18 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
static int screen_opengl_render_init(bContext *C, wmOperator *op)
{
/* new render clears all callbacks */
- Scene *scene= CTX_data_scene(C);
- ScrArea *prevsa= CTX_wm_area(C);
- ARegion *prevar= CTX_wm_region(C);
+ Scene *scene = CTX_data_scene(C);
+ ScrArea *prevsa = CTX_wm_area(C);
+ ARegion *prevar = CTX_wm_region(C);
RenderResult *rr;
GPUOffScreen *ofs;
OGLRender *oglrender;
int sizex, sizey;
- short is_view_context= RNA_boolean_get(op->ptr, "view_context");
- const short is_animation= RNA_boolean_get(op->ptr, "animation");
- const short is_write_still= RNA_boolean_get(op->ptr, "write_still");
- char err_out[256]= "unknown";
+ short is_view_context = RNA_boolean_get(op->ptr, "view_context");
+ const short is_animation = RNA_boolean_get(op->ptr, "animation");
+ const short is_sequencer = RNA_boolean_get(op->ptr, "sequencer");
+ const short is_write_still = RNA_boolean_get(op->ptr, "write_still");
+ char err_out[256] = "unknown";
if (G.background) {
BKE_report(op->reports, RPT_ERROR, "Can't use OpenGL render in background mode (no opengl context)");
@@ -279,7 +305,7 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
if (WM_jobs_test(CTX_wm_manager(C), scene))
return 0;
- if (!is_view_context && scene->camera==NULL) {
+ if (!is_view_context && scene->camera == NULL) {
BKE_report(op->reports, RPT_ERROR, "Scene has no camera");
return 0;
}
@@ -296,11 +322,11 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
WM_cursor_wait(1);
/* create offscreen buffer */
- sizex= (scene->r.size*scene->r.xsch)/100;
- sizey= (scene->r.size*scene->r.ysch)/100;
+ sizex = (scene->r.size * scene->r.xsch) / 100;
+ sizey = (scene->r.size * scene->r.ysch) / 100;
/* corrects render size with actual size, not every card supports non-power-of-two dimensions */
- ofs= GPU_offscreen_create(sizex, sizey, err_out);
+ ofs = GPU_offscreen_create(sizex, sizey, err_out);
if (!ofs) {
BKE_reportf(op->reports, RPT_ERROR, "Failed to create OpenGL offscreen buffer, %s", err_out);
@@ -308,27 +334,33 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
}
/* allocate opengl render */
- oglrender= MEM_callocN(sizeof(OGLRender), "OGLRender");
- op->customdata= oglrender;
+ oglrender = MEM_callocN(sizeof(OGLRender), "OGLRender");
+ op->customdata = oglrender;
- oglrender->ofs= ofs;
- oglrender->sizex= sizex;
- oglrender->sizey= sizey;
- oglrender->bmain= CTX_data_main(C);
- oglrender->scene= scene;
- oglrender->cfrao= scene->r.cfra;
+ oglrender->ofs = ofs;
+ oglrender->sizex = sizex;
+ oglrender->sizey = sizey;
+ oglrender->bmain = CTX_data_main(C);
+ oglrender->scene = scene;
+ oglrender->cfrao = scene->r.cfra;
+
+ oglrender->write_still = is_write_still && !is_animation;
+
+ oglrender->is_sequencer = is_sequencer;
+ if (is_sequencer) {
+ oglrender->sseq = CTX_wm_space_seq(C);;
+ }
- oglrender->write_still= is_write_still && !is_animation;
oglrender->obcenter_dia_back = U.obcenter_dia;
U.obcenter_dia = 0;
- oglrender->prevsa= prevsa;
- oglrender->prevar= prevar;
+ oglrender->prevsa = prevsa;
+ oglrender->prevar = prevar;
if (is_view_context) {
ED_view3d_context_user_region(C, &oglrender->v3d, &oglrender->ar); /* so quad view renders camera */
- oglrender->rv3d= oglrender->ar->regiondata;
+ oglrender->rv3d = oglrender->ar->regiondata;
/* MUST be cleared on exit */
oglrender->scene->customdata_mask_modal = (ED_view3d_datamask(oglrender->scene, oglrender->v3d) |
@@ -341,22 +373,22 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
}
/* create render */
- oglrender->re= RE_NewRender(scene->id.name);
+ oglrender->re = RE_NewRender(scene->id.name);
/* create image and image user */
- oglrender->ima= BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
+ oglrender->ima = BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
BKE_image_signal(oglrender->ima, NULL, IMA_SIGNAL_FREE);
BKE_image_backup_render(oglrender->scene, oglrender->ima);
- oglrender->iuser.scene= scene;
- oglrender->iuser.ok= 1;
+ oglrender->iuser.scene = scene;
+ oglrender->iuser.ok = 1;
/* create render result */
RE_InitState(oglrender->re, NULL, &scene->r, NULL, sizex, sizey, NULL);
- rr= RE_AcquireResultWrite(oglrender->re);
- if (rr->rectf==NULL)
- rr->rectf= MEM_callocN(sizeof(float)*4*sizex*sizey, "screen_opengl_render_init rect");
+ rr = RE_AcquireResultWrite(oglrender->re);
+ if (rr->rectf == NULL)
+ rr->rectf = MEM_callocN(sizeof(float) * 4 * sizex * sizey, "screen_opengl_render_init rect");
RE_ReleaseResult(oglrender->re);
return 1;
@@ -364,8 +396,8 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
static void screen_opengl_render_end(bContext *C, OGLRender *oglrender)
{
- Main *bmain= CTX_data_main(C);
- Scene *scene= oglrender->scene;
+ Main *bmain = CTX_data_main(C);
+ Scene *scene = oglrender->scene;
if (oglrender->mh) {
if (BKE_imtype_is_movie(scene->r.im_format.imtype))
@@ -373,20 +405,20 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender)
}
if (oglrender->timer) { /* exec will not have a timer */
- scene->r.cfra= oglrender->cfrao;
+ scene->r.cfra = oglrender->cfrao;
scene_update_for_newframe(bmain, scene, screen_opengl_layers(oglrender));
WM_event_remove_timer(CTX_wm_manager(C), CTX_wm_window(C), oglrender->timer);
}
WM_cursor_wait(0);
- WM_event_add_notifier(C, NC_SCENE|ND_RENDER_RESULT, oglrender->scene);
+ WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, oglrender->scene);
U.obcenter_dia = oglrender->obcenter_dia_back;
GPU_offscreen_free(oglrender->ofs);
- oglrender->scene->customdata_mask_modal= 0;
+ oglrender->scene->customdata_mask_modal = 0;
CTX_wm_area_set(C, oglrender->prevsa);
CTX_wm_region_set(C, oglrender->prevar);
@@ -408,11 +440,11 @@ static int screen_opengl_render_anim_initialize(bContext *C, wmOperator *op)
OGLRender *oglrender;
Scene *scene;
- oglrender= op->customdata;
- scene= oglrender->scene;
+ oglrender = op->customdata;
+ scene = oglrender->scene;
- oglrender->reports= op->reports;
- oglrender->mh= BKE_get_movie_handle(scene->r.im_format.imtype);
+ oglrender->reports = op->reports;
+ oglrender->mh = BKE_get_movie_handle(scene->r.im_format.imtype);
if (BKE_imtype_is_movie(scene->r.im_format.imtype)) {
if (!oglrender->mh->start_movie(scene, &scene->r, oglrender->sizex, oglrender->sizey, oglrender->reports)) {
screen_opengl_render_end(C, oglrender);
@@ -420,31 +452,31 @@ static int screen_opengl_render_anim_initialize(bContext *C, wmOperator *op)
}
}
- oglrender->cfrao= scene->r.cfra;
- oglrender->nfra= PSFRA;
- scene->r.cfra= PSFRA;
+ oglrender->cfrao = scene->r.cfra;
+ oglrender->nfra = PSFRA;
+ scene->r.cfra = PSFRA;
return 1;
}
static int screen_opengl_render_anim_step(bContext *C, wmOperator *op)
{
- Main *bmain= CTX_data_main(C);
- OGLRender *oglrender= op->customdata;
- Scene *scene= oglrender->scene;
+ Main *bmain = CTX_data_main(C);
+ OGLRender *oglrender = op->customdata;
+ Scene *scene = oglrender->scene;
ImBuf *ibuf;
void *lock;
char name[FILE_MAX];
- int ok= 0;
- const short view_context= (oglrender->v3d != NULL);
- Object *camera= NULL;
+ int ok = 0;
+ const short view_context = (oglrender->v3d != NULL);
+ Object *camera = NULL;
/* update animated image textures for gpu, etc,
* call before scene_update_for_newframe so modifiers with textuers don't lag 1 frame */
ED_image_update_frame(bmain, scene->r.cfra);
/* go to next frame */
- while (CFRA<oglrender->nfra) {
- unsigned int lay= screen_opengl_layers(oglrender);
+ while (CFRA < oglrender->nfra) {
+ unsigned int lay = screen_opengl_layers(oglrender);
if (lay & 0xFF000000)
lay &= 0xFF000000;
@@ -456,50 +488,50 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op)
scene_update_for_newframe(bmain, scene, screen_opengl_layers(oglrender));
if (view_context) {
- if (oglrender->rv3d->persp==RV3D_CAMOB && oglrender->v3d->camera && oglrender->v3d->scenelock) {
+ if (oglrender->rv3d->persp == RV3D_CAMOB && oglrender->v3d->camera && oglrender->v3d->scenelock) {
/* since scene_update_for_newframe() is used rather
* then ED_update_for_newframe() the camera needs to be set */
if (scene_camera_switch_update(scene)) {
- oglrender->v3d->camera= scene->camera;
+ oglrender->v3d->camera = scene->camera;
}
- camera= oglrender->v3d->camera;
+ camera = oglrender->v3d->camera;
}
}
else {
scene_camera_switch_update(scene);
- camera= scene->camera;
+ camera = scene->camera;
}
/* render into offscreen buffer */
screen_opengl_render_apply(oglrender);
/* save to disk */
- ibuf= BKE_image_acquire_ibuf(oglrender->ima, &oglrender->iuser, &lock);
+ ibuf = BKE_image_acquire_ibuf(oglrender->ima, &oglrender->iuser, &lock);
if (ibuf) {
/* color -> greyscale */
/* editing directly would alter the render view */
if (scene->r.im_format.planes == R_IMF_PLANES_BW) {
- ImBuf *ibuf_bw= IMB_dupImBuf(ibuf);
+ ImBuf *ibuf_bw = IMB_dupImBuf(ibuf);
IMB_color_to_bw(ibuf_bw);
// IMB_freeImBuf(ibuf); /* owned by the image */
- ibuf= ibuf_bw;
+ ibuf = ibuf_bw;
}
else {
/* this is lightweight & doesnt re-alloc the buffers, only do this
* to save the correct bit depth since the image is always RGBA */
- ImBuf *ibuf_cpy= IMB_allocImBuf(ibuf->x, ibuf->y, scene->r.im_format.planes, 0);
- ibuf_cpy->rect= ibuf->rect;
- ibuf_cpy->rect_float= ibuf->rect_float;
- ibuf_cpy->zbuf_float= ibuf->zbuf_float;
- ibuf= ibuf_cpy;
+ ImBuf *ibuf_cpy = IMB_allocImBuf(ibuf->x, ibuf->y, scene->r.im_format.planes, 0);
+ ibuf_cpy->rect = ibuf->rect;
+ ibuf_cpy->rect_float = ibuf->rect_float;
+ ibuf_cpy->zbuf_float = ibuf->zbuf_float;
+ ibuf = ibuf_cpy;
}
if (BKE_imtype_is_movie(scene->r.im_format.imtype)) {
- ok= oglrender->mh->append_movie(&scene->r, SFRA, CFRA, (int*)ibuf->rect,
- oglrender->sizex, oglrender->sizey, oglrender->reports);
+ ok = oglrender->mh->append_movie(&scene->r, SFRA, CFRA, (int *)ibuf->rect,
+ oglrender->sizex, oglrender->sizey, oglrender->reports);
if (ok) {
printf("Append frame %d", scene->r.cfra);
BKE_reportf(op->reports, RPT_INFO, "Appended frame: %d", scene->r.cfra);
@@ -507,9 +539,9 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op)
}
else {
BKE_makepicstring(name, scene->r.pic, oglrender->bmain->name, scene->r.cfra, scene->r.im_format.imtype, scene->r.scemode & R_EXTENSION, TRUE);
- ok= BKE_write_ibuf_stamp(scene, camera, ibuf, name, &scene->r.im_format);
+ ok = BKE_write_ibuf_stamp(scene, camera, ibuf, name, &scene->r.im_format);
- if (ok==0) {
+ if (ok == 0) {
printf("Write error: cannot save %s\n", name);
BKE_reportf(op->reports, RPT_ERROR, "Write error: cannot save %s", name);
}
@@ -544,11 +576,11 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op)
static int screen_opengl_render_modal(bContext *C, wmOperator *op, wmEvent *event)
{
- OGLRender *oglrender= op->customdata;
- int anim= RNA_boolean_get(op->ptr, "animation");
+ OGLRender *oglrender = op->customdata;
+ int anim = RNA_boolean_get(op->ptr, "animation");
int ret;
- switch(event->type) {
+ switch (event->type) {
case ESCKEY:
/* cancel */
screen_opengl_render_end(C, op->customdata);
@@ -563,7 +595,7 @@ static int screen_opengl_render_modal(bContext *C, wmOperator *op, wmEvent *even
}
/* run first because screen_opengl_render_anim_step can free oglrender */
- WM_event_add_notifier(C, NC_SCENE|ND_RENDER_RESULT, oglrender->scene);
+ WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, oglrender->scene);
if (anim == 0) {
screen_opengl_render_apply(op->customdata);
@@ -571,7 +603,7 @@ static int screen_opengl_render_modal(bContext *C, wmOperator *op, wmEvent *even
return OPERATOR_FINISHED;
}
else
- ret= screen_opengl_render_anim_step(C, op);
+ ret = screen_opengl_render_anim_step(C, op);
/* stop at the end or on error */
if (ret == 0) {
@@ -584,7 +616,7 @@ static int screen_opengl_render_modal(bContext *C, wmOperator *op, wmEvent *even
static int screen_opengl_render_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
OGLRender *oglrender;
- int anim= RNA_boolean_get(op->ptr, "animation");
+ int anim = RNA_boolean_get(op->ptr, "animation");
if (!screen_opengl_render_init(C, op))
return OPERATOR_CANCELLED;
@@ -594,11 +626,11 @@ static int screen_opengl_render_invoke(bContext *C, wmOperator *op, wmEvent *eve
return OPERATOR_CANCELLED;
}
- oglrender= op->customdata;
+ oglrender = op->customdata;
render_view_open(C, event->x, event->y);
WM_event_add_modal_handler(C, op);
- oglrender->timer= WM_event_add_timer(CTX_wm_manager(C), CTX_wm_window(C), TIMER, 0.01f);
+ oglrender->timer = WM_event_add_timer(CTX_wm_manager(C), CTX_wm_window(C), TIMER, 0.01f);
return OPERATOR_RUNNING_MODAL;
}
@@ -606,7 +638,7 @@ static int screen_opengl_render_invoke(bContext *C, wmOperator *op, wmEvent *eve
/* executes blocking render */
static int screen_opengl_render_exec(bContext *C, wmOperator *op)
{
- const short is_animation= RNA_boolean_get(op->ptr, "animation");
+ const short is_animation = RNA_boolean_get(op->ptr, "animation");
if (!screen_opengl_render_init(C, op))
return OPERATOR_CANCELLED;
@@ -619,25 +651,27 @@ static int screen_opengl_render_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
else {
- int ret= 1;
+ int ret = 1;
if (!screen_opengl_render_anim_initialize(C, op))
return OPERATOR_CANCELLED;
while (ret) {
- ret= screen_opengl_render_anim_step(C, op);
+ ret = screen_opengl_render_anim_step(C, op);
}
}
// no redraw needed, we leave state as we entered it
// ED_update_for_newframe(C, 1);
- WM_event_add_notifier(C, NC_SCENE|ND_RENDER_RESULT, CTX_data_scene(C));
+ WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, CTX_data_scene(C));
return OPERATOR_FINISHED;
}
void RENDER_OT_opengl(wmOperatorType *ot)
{
+ PropertyRNA *prop;
+
/* identifiers */
ot->name = "OpenGL Render";
ot->description = "OpenGL render active viewport";
@@ -651,9 +685,15 @@ void RENDER_OT_opengl(wmOperatorType *ot)
ot->poll = ED_operator_screenactive;
- RNA_def_boolean(ot->srna, "animation", 0, "Animation", "Render files from the animation range of this scene");
- RNA_def_boolean(ot->srna, "write_still", 0, "Write Image", "Save rendered the image to the output path (used only when animation is disabled)");
- RNA_def_boolean(ot->srna, "view_context", 1, "View Context", "Use the current 3D view for rendering, else use scene settings");
+ prop = RNA_def_boolean(ot->srna, "animation", 0, "Animation", "Render files from the animation range of this scene");
+ RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+ prop = RNA_def_boolean(ot->srna, "sequencer", 0, "Sequencer", "Render using the sequencers OpenGL display");
+ RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+ prop = RNA_def_boolean(ot->srna, "write_still", 0, "Write Image", "Save rendered the image to the output path (used only when animation is disabled)");
+ RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+ prop = RNA_def_boolean(ot->srna, "view_context", 1, "View Context", "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 */
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 13:57:15 +0300