[Bf-blender-cvs] [bb20c44bac4] bevelv2: Merge branch 'master' into bevelv2

[Howard Trickey]

Commit: bb20c44bac44b3d8f1823a0f55a905413ae6a54d
Author: Howard Trickey
Date:   Tue Sep 20 08:26:34 2022 -0400
Branches: bevelv2
https://developer.blender.org/rBbb20c44bac44b3d8f1823a0f55a905413ae6a54d

Merge branch 'master' into bevelv2

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



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

diff --cc source/blender/makesrna/intern/rna_nodetree.c
index 89e1b38a2cc,971043158e1..afcb3f9c677
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@@ -9614,27 -9614,31 +9614,52 @@@ static void def_geo_extrude_mesh(Struct
    RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
  }
  
 +static void def_geo_bevel_mesh(StructRNA *srna)
 +{
 +  PropertyRNA *prop;
 +
 +  static const EnumPropertyItem mode_items[] = {
 +      {GEO_NODE_BEVEL_MESH_VERTICES, "VERTICES", 0, "Vertices", ""},
 +      {GEO_NODE_BEVEL_MESH_EDGES, "EDGES", 0, "Edges", ""},
 +      {GEO_NODE_BEVEL_MESH_FACES, "FACES", 0, "Faces", ""},
 +      {0, NULL, 0, NULL, NULL},
 +  };
 +
 +  RNA_def_struct_sdna_from(srna, "NodeGeometryBevelMesh", "storage");
 +
 +  prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
 +  RNA_def_property_enum_sdna(prop, NULL, "mode");
 +  RNA_def_property_enum_items(prop, mode_items);
 +  RNA_def_property_enum_default(prop, GEO_NODE_BEVEL_MESH_FACES);
 +  RNA_def_property_ui_text(prop, "Mode", "");
 +  RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 +}
 +
+ static void def_geo_distribute_points_in_volume(StructRNA *srna)
+ {
+   PropertyRNA *prop;
+ 
+   static const EnumPropertyItem mode_items[] = {
+       {GEO_NODE_DISTRIBUTE_POINTS_IN_VOLUME_DENSITY_RANDOM,
+        "DENSITY_RANDOM",
+        0,
+        "Random",
+        "Distribute points randomly inside of the volume"},
+       {GEO_NODE_DISTRIBUTE_POINTS_IN_VOLUME_DENSITY_GRID,
+        "DENSITY_GRID",
+        0,
+        "Grid",
+        "Distribute the points in a grid pattern inside of the volume"},
+       {0, NULL, 0, NULL, NULL},
+   };
+ 
+   RNA_def_struct_sdna_from(srna, "NodeGeometryDistributePointsInVolume", "storage");
+   prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
+   RNA_def_property_enum_items(prop, mode_items);
+   RNA_def_property_ui_text(prop, "Distribution Method", "Method to use for scattering points");
+   RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
+ }
+ 
  static void def_geo_distribute_points_on_faces(StructRNA *srna)
  {
    PropertyRNA *prop;