diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-13 02:13:45 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-13 02:14:57 +0400 |
| commit | e43c3ad88af70617f7708a82c0189f202681ac67 (patch) | |
| tree | 996e3af3e853c5c1b9697cef9d611077fcccecd3 /intern/cycles/blender/blender_sync.h | |
| parent | 9cc380e02668a7ff4c28e9541cfe84fdb1ff47ba (diff) | |
Fix issue in recent bugfix, did not work with multiple sessions (preview render).
Diffstat (limited to 'intern/cycles/blender/blender_sync.h')
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 3d2a3ae5aac..205761ad302 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -53,7 +53,7 @@ public: /* sync */ bool sync_recalc(); - void sync_data(BL::SpaceView3D b_v3d, BL::Object b_override, const char *layer = 0); + void sync_data(BL::SpaceView3D b_v3d, BL::Object b_override, void **python_thread_state, const char *layer = 0); void sync_render_layers(BL::SpaceView3D b_v3d, const char *layer); void sync_integrator(); void sync_camera(BL::RenderSettings b_render, BL::Object b_override, int width, int height); @@ -72,7 +72,7 @@ private: void sync_lamps(bool update_all); void sync_materials(bool update_all); void sync_objects(BL::SpaceView3D b_v3d, int motion = 0); - void sync_motion(BL::SpaceView3D b_v3d, BL::Object b_override); + void sync_motion(BL::SpaceView3D b_v3d, BL::Object b_override, void **python_thread_state); void sync_film(); void sync_view(); void sync_world(bool update_all); |