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_geometry.cpp | |
| parent | e0085bfd24da3dcfb30498ad8c579620042aa6c5 (diff) | |
Fix T74095: crash deleting all faces in edit mode with Cycles rendering
Diffstat (limited to 'intern/cycles/blender/blender_geometry.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_geometry.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/intern/cycles/blender/blender_geometry.cpp b/intern/cycles/blender/blender_geometry.cpp index 8b803835b62..304b3d18e27 100644 --- a/intern/cycles/blender/blender_geometry.cpp +++ b/intern/cycles/blender/blender_geometry.cpp @@ -117,20 +117,18 @@ Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph, geometry_synced.insert(geom); - geom->clear(); - geom->used_shaders = used_shaders; geom->name = ustring(b_ob_data.name().c_str()); if (use_particle_hair) { - sync_hair(b_depsgraph, b_ob, geom); + sync_hair(b_depsgraph, b_ob, geom, used_shaders); } else if (object_fluid_gas_domain_find(b_ob)) { Mesh *mesh = static_cast<Mesh *>(geom); - sync_volume(b_ob, mesh); + sync_volume(b_ob, mesh, used_shaders); } else { Mesh *mesh = static_cast<Mesh *>(geom); - sync_mesh(b_depsgraph, b_ob, mesh); + sync_mesh(b_depsgraph, b_ob, mesh, used_shaders); } return geom; |