[Bf-blender-cvs] [18a43b5dd56] curve-nodes-modifier: Cleanup: Comment and redundant logic
Hans Goudey
noreply at git.blender.org
Fri Jul 16 05:04:45 CEST 2021
Commit: 18a43b5dd56d34294922588e4ac97ebd6d815b26
Author: Hans Goudey
Date: Thu Jul 15 23:04:34 2021 -0400
Branches: curve-nodes-modifier
https://developer.blender.org/rB18a43b5dd56d34294922588e4ac97ebd6d815b26
Cleanup: Comment and redundant logic
===================================================================
M source/blender/blenkernel/intern/displist.cc
M source/blender/depsgraph/intern/depsgraph_query_iter.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc
index 40442ae184b..60361527d97 100644
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@ -959,8 +959,6 @@ static GeometrySet curve_calc_modifiers_post(Depsgraph *depsgraph,
/* XXX2.8(Sybren): make sure the face normals are recalculated as well */
BKE_mesh_ensure_normals(final_mesh);
- /* Set flag which makes it easier to see what's going on in a debugger. */
- final_mesh->id.tag |= LIB_TAG_COPIED_ON_WRITE_EVAL_RESULT;
BLI_strncpy(final_mesh->id.name, cu->id.name, sizeof(final_mesh->id.name));
*((short *)final_mesh->id.name) = ID_ME;
}
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index 580f1cdff87..9acf92cf03a 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -236,9 +236,8 @@ bool deg_iterator_components_step(BLI_Iterator *iter)
if (curve != nullptr) {
Object *temp_object = &data->temp_geometry_component_object;
*temp_object = *data->geometry_component_owner;
- /* Use OB_FONT when the owner is a text object, so that the text editing edit mode
- * overlays will draw. Here it's important that text objects don't support the nodes
- * modifier, so they always have data corresponding to their original text. */
+ /* Use OB_FONT when the owner is a text object, so that
+ * the text editing edit mode overlays will draw. */
temp_object->type = data->geometry_component_owner->type == OB_FONT ? OB_FONT : OB_CURVE;
temp_object->data = (void *)curve;
temp_object->runtime.select_id = data->geometry_component_owner->runtime.select_id;
More information about the Bf-blender-cvs
mailing list