diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-11 17:29:49 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-11 18:06:28 +0300 |
commit | 0461f45e5e0bcaa8c94265ddbaf442ef7e1b1227 (patch) | |
tree | 754c0373b4325c0c4ee4904ea33c5fa97bc1aa56 /intern/cycles/blender/blender_session.h | |
parent | 84692844a3d6493ce0649c5021ec92e684b59a86 (diff) |
Fix T55436: crash with point density and shader tweaking.
With copy-on-write we can no longer assumes the point density data is
available after Cycles synchronization with Blender data is done. So
force it to be loaded earlier, even if it's not great for interactivity.
Diffstat (limited to 'intern/cycles/blender/blender_session.h')
-rw-r--r-- | intern/cycles/blender/blender_session.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h index aecb304c270..1d727e416a0 100644 --- a/intern/cycles/blender/blender_session.h +++ b/intern/cycles/blender/blender_session.h @@ -166,6 +166,7 @@ protected: float *pixels, const size_t pixels_size, const bool free_cache); + void builtin_images_load(); /* Update tile manager to reflect resumable render settings. */ void update_resumable_tile_manager(int num_samples); |