Revision: 15023
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15023
Author: campbellbarton
Date: 2008-05-28 02:44:41 +0200 (Wed, 28 May 2008)
Log Message:
-----------
bugfix
* python api render() would clamp the endframe to a short.
* python api's render() and renderAnim() would not render compositing because
the name they gave to RE_NewRender was NOT G.scene->id.name, added comments to
G.scene->id.name
Modified Paths:
--------------
trunk/blender/source/blender/python/api2_2x/sceneRender.c
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/python/api2_2x/sceneRender.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/sceneRender.c 2008-05-27
23:53:56 UTC (rev 15022)
+++ trunk/blender/source/blender/python/api2_2x/sceneRender.c 2008-05-28
00:44:41 UTC (rev 15023)
@@ -478,10 +478,12 @@
}
else { /* background mode (blender -b file.blend -P script) */
- Render *re= RE_NewRender("Render");
+ Render *re= RE_NewRender(G.scene->id.name);
- int end_frame = G.scene->r.efra; /* is of type short currently
*/
+
+ int end_frame = G.scene->r.efra;
+
if (G.scene != self->scene)
return EXPP_ReturnPyObjError (PyExc_RuntimeError,
"scene to render in bg mode must be the active
scene");
@@ -490,7 +492,7 @@
RE_BlenderAnim(re, G.scene, G.scene->r.sfra, G.scene->r.efra);
- G.scene->r.efra = (short)end_frame;
+ G.scene->r.efra = end_frame;
}
Py_RETURN_NONE;
@@ -571,7 +573,7 @@
set_scene( oldsce );
}
else { /* background mode (blender -b file.blend -P script) */
- Render *re= RE_NewRender("Render");
+ Render *re= RE_NewRender(G.scene->id.name);
if (G.scene != self->scene)
return EXPP_ReturnPyObjError (PyExc_RuntimeError,
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2008-05-27 23:53:56 UTC (rev 15022)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2008-05-28 00:44:41 UTC (rev 15023)
@@ -993,6 +993,7 @@
return &re->i;
}
+/* Note, when rendering from a scene, ALWAYS use G.scene->id.name, else
compositing wont work */
Render *RE_NewRender(const char *name)
{
Render *re;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
