diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
| commit | 080cf9332bc9d71e0e14326bc8efdf06b738dea1 (patch) | |
| tree | e8531a509dca4d8253aa19d89edc68152421f9e5 /intern/cycles/blender/addon/engine.py | |
| parent | 6d495cc4ef071171ff0686b2be898a41e05b8051 (diff) | |
| parent | 9676642cc94599b3419c9aaa5cf1aae2fbbd235f (diff) | |
Merge branch 'gooseberry' into temp_motionpathstemp_motionpaths
Conflicts:
source/blender/blenkernel/intern/object.c
Diffstat (limited to 'intern/cycles/blender/addon/engine.py')
| -rw-r--r-- | intern/cycles/blender/addon/engine.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py index e50a8e45b52..4187e2381ac 100644 --- a/intern/cycles/blender/addon/engine.py +++ b/intern/cycles/blender/addon/engine.py @@ -59,11 +59,11 @@ def render(engine): _cycles.render(engine.session) -def bake(engine, obj, pass_type, pixel_array, num_pixels, depth, result): +def bake(engine, obj, pass_type, object_id, pixel_array, num_pixels, depth, result): import _cycles session = getattr(engine, "session", None) if session is not None: - _cycles.bake(engine.session, obj.as_pointer(), pass_type, pixel_array.as_pointer(), num_pixels, depth, result.as_pointer()) + _cycles.bake(engine.session, obj.as_pointer(), pass_type, object_id, pixel_array.as_pointer(), num_pixels, depth, result.as_pointer()) def reset(engine, data, scene): |