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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-02-17 14:23:03 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-02-17 14:25:16 +0300
commit4660c00ac57effeb9598bb3083900dc354a4f43f (patch)
tree6e0e38abad5ecb36f15ea80e0e22c639213cb2dc /intern/cycles/blender/blender_python.cpp
parent7307f3b48564191dfcf2ccd71e730c41c6486289 (diff)
Cycles: Make blender session aware of rendering from command line
This way we can do some more aggressive policy about releasing temporary data during synchronization.
Diffstat (limited to 'intern/cycles/blender/blender_python.cpp')
-rw-r--r--intern/cycles/blender/blender_python.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp
index 120d6b0d4de..78419f76283 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -90,10 +90,10 @@ static PyObject *init_func(PyObject *self, PyObject *args)
static PyObject *create_func(PyObject *self, PyObject *args)
{
PyObject *pyengine, *pyuserpref, *pydata, *pyscene, *pyregion, *pyv3d, *pyrv3d;
- int preview_osl, background;
+ int preview_osl, headless;
if(!PyArg_ParseTuple(args, "OOOOOOOii", &pyengine, &pyuserpref, &pydata, &pyscene,
- &pyregion, &pyv3d, &pyrv3d, &preview_osl, &background))
+ &pyregion, &pyv3d, &pyrv3d, &preview_osl, &headless))
{
return NULL;
}
@@ -146,14 +146,8 @@ static PyObject *create_func(PyObject *self, PyObject *args)
RNA_boolean_set(&cscene, "use_progressive_refine", true);
}
- /* Use more optimal tile order when rendering from the command line. */
- if(background) {
- PointerRNA cscene = RNA_pointer_get(&sceneptr, "cycles");
- RNA_enum_set(&cscene, "tile_order", (int)TILE_BOTTOM_TO_TOP);
- }
-
/* offline session or preview render */
- session = new BlenderSession(engine, userpref, data, scene);
+ session = new BlenderSession(engine, userpref, data, scene, headless);
}
python_thread_state_save(&session->python_thread_state);