diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-02-25 13:52:32 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-02-25 13:53:25 +0300 |
commit | 7463da6c72a0fb2bc72bda53ece27670d5af2c72 (patch) | |
tree | c34870a0748e63cdd400686b8ffb194412765a6b /intern/cycles/blender/blender_curves.cpp | |
parent | e0085bfd24da3dcfb30498ad8c579620042aa6c5 (diff) |
Fix T74095: crash deleting all faces in edit mode with Cycles rendering
Diffstat (limited to 'intern/cycles/blender/blender_curves.cpp')
-rw-r--r-- | intern/cycles/blender/blender_curves.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index affd5685337..fe0f8f3b88a 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -1154,7 +1154,10 @@ void BlenderSync::sync_particle_hair( } } -void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph, BL::Object b_ob, Geometry *geom) +void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph, + BL::Object b_ob, + Geometry *geom, + const vector<Shader *> &used_shaders) { Hair *hair = (geom->type == Geometry::HAIR) ? static_cast<Hair *>(geom) : NULL; Mesh *mesh = (geom->type == Geometry::MESH) ? static_cast<Mesh *>(geom) : NULL; @@ -1172,6 +1175,9 @@ void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph, BL::Object b_ob, Geometry oldtriangles.steal_data(mesh->triangles); } + geom->clear(); + geom->used_shaders = used_shaders; + if (view_layer.use_hair && scene->curve_system_manager->use_curves) { /* Particle hair. */ bool need_undeformed = geom->need_attribute(scene, ATTR_STD_GENERATED); |