kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #29109: bpy.ops.render.render() with scene parameter missed compositing,

Browse Source 
previous bugfix needed a bit more refining.
This commit is contained in:
Brecht Van Lommel 2011-11-01 14:51:44 +00:00
parent 4b48a5a497
commit d55298ee3c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/render/render_internal.c
View File

@ -223,20 +223,26 @@ static int screen_render_exec(bContext *C, wmOperator *op)
{ {
Scene *scene= CTX_data_scene(C); Scene *scene= CTX_data_scene(C);
SceneRenderLayer *srl= NULL; SceneRenderLayer *srl= NULL;
Render *re= RE_NewRender(scene->id.name); Render *re;
Image *ima; Image *ima;
View3D *v3d= CTX_wm_view3d(C); View3D *v3d= CTX_wm_view3d(C);
Main *mainp= CTX_data_main(C); Main *mainp= CTX_data_main(C);
unsigned int lay= (v3d)? v3d->lay: scene->lay; unsigned int lay;
const short is_animation= RNA_boolean_get(op->ptr, "animation"); const short is_animation= RNA_boolean_get(op->ptr, "animation");
const short is_write_still= RNA_boolean_get(op->ptr, "write_still"); const short is_write_still= RNA_boolean_get(op->ptr, "write_still");
struct Object *camera_override= v3d ? V3D_CAMERA_LOCAL(v3d) : NULL; struct Object *camera_override= v3d ? V3D_CAMERA_LOCAL(v3d) : NULL;
/* custom scene and single layer re-render */
screen_render_scene_layer_set(op, mainp, &scene, &srl);
if(!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.imtype)) { if(!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.imtype)) {
BKE_report(op->reports, RPT_ERROR, "Can't write a single file with an animation format selected"); BKE_report(op->reports, RPT_ERROR, "Can't write a single file with an animation format selected");
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
} }
re= RE_NewRender(scene->id.name);
lay= (v3d)? v3d->lay: scene->lay;
G.afbreek= 0; G.afbreek= 0;
RE_test_break_cb(re, NULL, (int (*)(void *)) blender_test_break); RE_test_break_cb(re, NULL, (int (*)(void *)) blender_test_break);
@ -252,9 +258,6 @@ static int screen_render_exec(bContext *C, wmOperator *op)
RE_SetReports(re, op->reports); RE_SetReports(re, op->reports);
/* custom scene and single layer re-render */
screen_render_scene_layer_set(op, mainp, &scene, &srl);
if(is_animation) if(is_animation)
RE_BlenderAnim(re, mainp, scene, camera_override, lay, scene->r.sfra, scene->r.efra, scene->r.frame_step); RE_BlenderAnim(re, mainp, scene, camera_override, lay, scene->r.sfra, scene->r.efra, scene->r.frame_step);
else else