[Bf-blender-cvs] [e15c20fa3e2] temp-geometry-nodes-extrude-and-scale: remove curve mode

Jacques Lucke noreply at git.blender.org
Tue Jan 11 18:04:51 CET 2022


Commit: e15c20fa3e28c8a29405a2761e81a041acc540a0
Author: Jacques Lucke
Date:   Mon Jan 10 18:49:32 2022 +0100
Branches: temp-geometry-nodes-extrude-and-scale
https://developer.blender.org/rBe15c20fa3e28c8a29405a2761e81a041acc540a0

remove curve mode

===================================================================

M	source/blender/makesdna/DNA_node_types.h
M	source/blender/makesrna/intern/rna_nodetree.c
M	source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc

===================================================================

diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index e2d6712abe9..750d17934a5 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -2323,7 +2323,6 @@ typedef enum GeometryNodeRealizeInstancesFlag {
 typedef enum GeometryNodeScaleElementsMode {
   GEO_NODE_SCALE_ELEMENTS_MODE_FACE = 0,
   GEO_NODE_SCALE_ELEMENTS_MODE_EDGE = 1,
-  GEO_NODE_SCALE_ELEMENTS_MODE_CURVE = 2,
 } GeometryNodeScaleElementsMode;
 
 #define GEO_NODE_SCALE_ELEMENTS_UNIFORM 1
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 79cc74d1889..de68196aa22 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -11388,7 +11388,6 @@ static void def_geo_scale_elements(StructRNA *srna)
        ICON_NONE,
        "Edge",
        "Scale individual edges or neighbouring edge islands"},
-      {GEO_NODE_SCALE_ELEMENTS_MODE_CURVE, "CURVE", ICON_NONE, "Curve", "Scale individual curves"},
       {0, NULL, 0, NULL, NULL},
   };
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc
index eb772d4c371..570a7ce0f62 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc
@@ -341,9 +341,6 @@ static void node_geo_exec(GeoNodeExecParams params)
         }
         break;
       }
-      case GEO_NODE_SCALE_ELEMENTS_MODE_CURVE: {
-        break;
-      }
     }
   });



More information about the Bf-blender-cvs mailing list