Commit: f9ce74425c9d41d8981c0d05129176ccd38a57e4
Author: Hans Goudey
Date: Mon Jul 12 22:22:11 2021 -0400
Branches: curve-nodes-modifier
https://developer.blender.org/rBf9ce74425c9d41d8981c0d05129176ccd38a57e4
Cleanup: Fix typos, add deprecated comment to flag
===================================================================
M source/blender/blenkernel/intern/displist.cc
M source/blender/makesdna/DNA_curve_types.h
===================================================================
diff --git a/source/blender/blenkernel/intern/displist.cc
b/source/blender/blenkernel/intern/displist.cc
index 514d7212ea0..e0ffeda281b 100644
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@ -834,7 +834,7 @@ void BKE_curve_calc_modifiers_pre(Depsgraph *depsgraph,
/**
* \return True if the deformed curve control point data should be implicitly
- * converted directly to a mesh, or false it can be left as curve data via
#CurveEval.
+ * converted directly to a mesh, or false if it can be left as curve data via
#CurveEval.
*/
static bool do_curve_implicit_mesh_conversion(const Curve *curve,
ModifierData *first_modifier,
@@ -857,7 +857,7 @@ static bool do_curve_implicit_mesh_conversion(const Curve
*curve,
}
/* If a non-geometry-nodes modifier is enabled before a nodes modifier,
- * force conversion to mesh, since it doesn't support curve data. */
+ * force conversion to mesh, since only the nodes modifier supports curve
data. */
ModifierData *md = first_modifier;
for (; md; md = md->next) {
if (BKE_modifier_is_enabled(scene, md, required_mode)) {
diff --git a/source/blender/makesdna/DNA_curve_types.h
b/source/blender/makesdna/DNA_curve_types.h
index 2ea6dfd4c97..aee393f6540 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -337,6 +337,7 @@ enum {
CU_DS_EXPAND = 1 << 11,
/** make use of the path radius if this is enabled (default for new curves)
*/
CU_PATH_RADIUS = 1 << 12,
+ /* CU_DEFORM_FILL = 1 << 13, */ /* DEPRECATED */
/** fill bevel caps */
CU_FILL_CAPS = 1 << 14,
/** map taper object to beveled area */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
