[Bf-blender-cvs] [4606e83a758] geometry-nodes: Merge branch 'master' into geometry-nodes

[Jacques Lucke]

Commit: 4606e83a75843548541ef462f14817047800b7f2
Author: Jacques Lucke
Date:   Wed Oct 21 14:00:32 2020 +0200
Branches: geometry-nodes
https://developer.blender.org/rB4606e83a75843548541ef462f14817047800b7f2

Merge branch 'master' into geometry-nodes

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



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

diff --cc source/blender/editors/space_node/space_node.c
index 150abaa19a9,d2502e6408c..ec294ed4298
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@@ -935,8 -935,8 +935,8 @@@ static void node_space_subtype_item_ext
    bool free;
    const EnumPropertyItem *item_src = RNA_enum_node_tree_types_itemf_impl(C, &free);
    for (const EnumPropertyItem *item_iter = item_src; item_iter->identifier; item_iter++) {
-     if (!U.experimental.use_new_particle_system &&
+     if (!U.experimental.use_new_geometry_nodes &&
 -        STREQ(item_iter->identifier, "SimulationNodeTree")) {
 +        STREQ(item_iter->identifier, "GeometryNodeTree")) {
        continue;
      }
      RNA_enum_item_add(item, totitem, item_iter);
diff --cc source/blender/makesrna/RNA_access.h
index defb303ddfb,6dfd7b0fdf5..a6601951e3b
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@@ -565,11 -565,11 +565,11 @@@ extern StructRNA RNA_ShrinkwrapModifier
  extern StructRNA RNA_SimpleDeformModifier;
  extern StructRNA RNA_SimplifyGpencilModifier;
  extern StructRNA RNA_Simulation;
- #ifdef WITH_PARTICLE_NODES
+ #ifdef WITH_GEOMETRY_NODES
 -extern StructRNA RNA_SimulationModifier;
 +extern StructRNA RNA_NodesModifier;
  #endif
 -extern StructRNA RNA_SimulationNode;
 -extern StructRNA RNA_SimulationNodeTree;
 +extern StructRNA RNA_GeometryNode;
 +extern StructRNA RNA_GeometryNodeTree;
  extern StructRNA RNA_SkinModifier;
  extern StructRNA RNA_SmoothGpencilModifier;
  extern StructRNA RNA_SmoothModifier;
diff --cc source/blender/makesrna/intern/rna_modifier.c
index e3be5c7c7b5,7885e182787..65804bc54d2
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -6922,16 -6919,15 +6922,16 @@@ static void rna_def_modifier_weightedno
    RNA_define_lib_overridable(false);
  }
  
- #  ifdef WITH_PARTICLE_NODES
+ #  ifdef WITH_GEOMETRY_NODES
 -static void rna_def_modifier_simulation(BlenderRNA *brna)
 +static void rna_def_modifier_nodes(BlenderRNA *brna)
  {
    StructRNA *srna;
 +  PropertyRNA *prop;
  
 -  srna = RNA_def_struct(brna, "SimulationModifier", "Modifier");
 -  RNA_def_struct_ui_text(srna, "Simulation Modifier", "");
 -  RNA_def_struct_sdna(srna, "SimulationModifierData");
 -  RNA_def_struct_ui_icon(srna, ICON_PHYSICS); /* TODO: Use correct icon. */
 +  srna = RNA_def_struct(brna, "NodesModifier", "Modifier");
 +  RNA_def_struct_ui_text(srna, "Nodes Modifier", "");
 +  RNA_def_struct_sdna(srna, "NodesModifierData");
 +  RNA_def_struct_ui_icon(srna, ICON_MESH_DATA); /* TODO: Use correct icon. */
  
    RNA_define_lib_overridable(true);
  
@@@ -7299,8 -7289,8 +7299,8 @@@ void RNA_def_modifier(BlenderRNA *brna
    rna_def_modifier_meshseqcache(brna);
    rna_def_modifier_surfacedeform(brna);
    rna_def_modifier_weightednormal(brna);
- #  ifdef WITH_PARTICLE_NODES
+ #  ifdef WITH_GEOMETRY_NODES
 -  rna_def_modifier_simulation(brna);
 +  rna_def_modifier_nodes(brna);
  #  endif
    rna_def_modifier_mesh_to_volume(brna);
    rna_def_modifier_volume_displace(brna);
diff --cc source/blender/modifiers/intern/MOD_nodes.cc
index 39ee9be6585,10a4b3f7cf9..579168268cd
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@@ -158,16 -150,16 +158,16 @@@ static void copyData(const ModifierDat
  
  static void freeData(ModifierData *md)
  {
 -  SimulationModifierData *smd = reinterpret_cast<SimulationModifierData *>(md);
 -  UNUSED_VARS(smd);
 +  NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
 +  UNUSED_VARS(nmd);
  }
  
 -ModifierTypeInfo modifierType_Simulation = {
 -    /* name */ "Simulation",
 -    /* structName */ "SimulationModifierData",
 -    /* structSize */ sizeof(SimulationModifierData),
 +ModifierTypeInfo modifierType_Nodes = {
 +    /* name */ "Nodes",
 +    /* structName */ "NodesModifierData",
 +    /* structSize */ sizeof(NodesModifierData),
- #ifdef WITH_PARTICLE_NODES
+ #ifdef WITH_GEOMETRY_NODES
 -    /* srna */ &RNA_SimulationModifier,
 +    /* srna */ &RNA_NodesModifier,
  #else
      /* srna */ &RNA_Modifier,
  #endif