Commit: 4a2eac8897af7adbfc5225eba6750d5c6cb22f07 Author: Hans Goudey Date: Wed Jun 16 17:30:33 2021 -0500 Branches: curve-nodes-modifier https://developer.blender.org/rB4a2eac8897af7adbfc5225eba6750d5c6cb22f07
Fix order of assigning geometry set and BKE_object_eval_assign_data =================================================================== M source/blender/blenkernel/intern/displist.cc =================================================================== diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc index 34a1f956f41..143dffa8ed7 100644 --- a/source/blender/blenkernel/intern/displist.cc +++ b/source/blender/blenkernel/intern/displist.cc @@ -1606,6 +1606,10 @@ void BKE_displist_make_curveTypes(Depsgraph *depsgraph, do_makeDispListCurveTypes( depsgraph, scene, ob, dispbase, for_render, for_orco, &mesh_eval, &geometry_set); + if (mesh_eval != nullptr) { + BKE_object_eval_assign_data(ob, &mesh_eval->id, true); + } + if (geometry_set != nullptr) { MeshComponent &mesh_component = geometry_set->get_component_for_write<MeshComponent>(); mesh_component.replace_mesh_but_keep_vertex_group_names(mesh_eval, @@ -1613,10 +1617,6 @@ void BKE_displist_make_curveTypes(Depsgraph *depsgraph, ob->runtime.geometry_set_eval = geometry_set; } - if (mesh_eval != nullptr) { - BKE_object_eval_assign_data(ob, &mesh_eval->id, true); - } - boundbox_displist_object(ob); } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs