diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-05-24 15:52:43 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-05-24 15:54:51 +0300 |
commit | 05a9788b254d4e168f7a46d406aadf34b449d465 (patch) | |
tree | 588e8a4bd4b5f0136d2ea298775db26e85941c3e /intern | |
parent | fae58962493010f7c9c7d78f79e64165539f4317 (diff) |
Fix T64101: Crash entering edit mode with particle system
Explicitly disable particles in edit for now.
Those were not rendered already, but were attempted to be converted
to Cycles structures (if UVs were not needed for hair nothing was
rendered, but if UVs are needed then crash happened).
Would be nice to bring hair in edit mode back, but this is a bit
more involved change, which will be done later.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/blender_curves.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index 1a36376f36e..29a1408d85d 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -978,7 +978,7 @@ void BlenderSync::sync_curves( /* obtain general settings */ const bool use_curves = scene->curve_system_manager->use_curves; - if (!(use_curves && b_ob.mode() != b_ob.mode_PARTICLE_EDIT)) { + if (!(use_curves && b_ob.mode() != b_ob.mode_PARTICLE_EDIT && b_ob.mode() != b_ob.mode_EDIT)) { if (!motion) mesh->compute_bounds(); return; |