archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T74095: crash deleting all faces in edit mode with Cycles rendering

Browse Source
This commit is contained in:
Brecht Van Lommel
2020-02-25 11:52:32 +01:00
parent e0085bfd24
commit 7463da6c72
5 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/blender/blender_curves.cpp
View File

@@ -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);