diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-13 00:49:34 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-13 00:55:19 +0400 |
| commit | f462e8a9c826a308a454f13bb867083e866b9877 (patch) | |
| tree | 59a6e0469bad302eb0a59cb2ca6595784ee43ff4 /intern/cycles/blender/blender_util.h | |
| parent | 6ad9941c74c5e6c5a1fe519ed1dba2561528d0fe (diff) | |
Fix T38332, Fix T38607: cycles render crash with motion blur.
It wasn't working together well with the python thread state changes after the
depsgraph multithreading.
Diffstat (limited to 'intern/cycles/blender/blender_util.h')
| -rw-r--r-- | intern/cycles/blender/blender_util.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index cb0f7b76d56..c9048cd8a28 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -37,6 +37,9 @@ float *BKE_image_get_float_pixels_for_frame(void *image, int frame); CCL_NAMESPACE_BEGIN +void python_thread_state_save(); +void python_thread_state_restore(); + static inline BL::Mesh object_to_mesh(BL::BlendData data, BL::Object object, BL::Scene scene, bool apply_modifiers, bool render, bool calc_undeformed) { return data.meshes.new_from_object(scene, object, apply_modifiers, (render)? 2: 1, true, calc_undeformed); |