[Bf-blender-cvs] [3d3a20d6d18] master: Cleanup: remove most of "#ifdef WITH_GEOMETRY_NODES"

[Dalai Felinto]

Commit: 3d3a20d6d18afe691db631acc61a0c8251d12137
Author: Dalai Felinto
Date:   Wed Nov 18 01:53:37 2020 +0100
Branches: master
https://developer.blender.org/rB3d3a20d6d18afe691db631acc61a0c8251d12137

Cleanup: remove most of "#ifdef WITH_GEOMETRY_NODES"

The ones around the simulation datablock are still there, since they are not
needed for the features planned for master yet.

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

M	source/blender/makesrna/RNA_access.h
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/intern/MOD_nodes.cc

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

diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index bc25a404de8..f51202348b5 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -565,10 +565,8 @@ extern StructRNA RNA_ShrinkwrapModifier;
 extern StructRNA RNA_SimpleDeformModifier;
 extern StructRNA RNA_SimplifyGpencilModifier;
 extern StructRNA RNA_Simulation;
-#ifdef WITH_GEOMETRY_NODES
 extern StructRNA RNA_NodesModifier;
 extern StructRNA RNA_NodesModifierSettings;
-#endif
 extern StructRNA RNA_GeometryNode;
 extern StructRNA RNA_GeometryNodeTree;
 extern StructRNA RNA_SkinModifier;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 30d612d2634..2794029dae2 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -6952,7 +6952,6 @@ static void rna_def_modifier_weightednormal(BlenderRNA *brna)
   RNA_define_lib_overridable(false);
 }
 
-#  ifdef WITH_GEOMETRY_NODES
 static void rna_def_modifier_nodes_settings(BlenderRNA *brna)
 {
   StructRNA *srna;
@@ -6991,7 +6990,6 @@ static void rna_def_modifier_nodes(BlenderRNA *brna)
 
   rna_def_modifier_nodes_settings(brna);
 }
-#  endif
 
 static void rna_def_modifier_mesh_to_volume(BlenderRNA *brna)
 {
@@ -7356,9 +7354,7 @@ void RNA_def_modifier(BlenderRNA *brna)
   rna_def_modifier_meshseqcache(brna);
   rna_def_modifier_surfacedeform(brna);
   rna_def_modifier_weightednormal(brna);
-#  ifdef WITH_GEOMETRY_NODES
   rna_def_modifier_nodes(brna);
-#  endif
   rna_def_modifier_mesh_to_volume(brna);
   rna_def_modifier_volume_displace(brna);
   rna_def_modifier_volume_to_mesh(brna);
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index b1849b3dbf2..d30f76302a5 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -968,7 +968,6 @@ static void draw_property_for_socket(uiLayout *layout,
 
 static void panel_draw(const bContext *C, Panel *panel)
 {
-#ifdef WITH_GEOMETRY_NODES
   uiLayout *layout = panel->layout;
 
   PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr);
@@ -999,7 +998,6 @@ static void panel_draw(const bContext *C, Panel *panel)
   }
 
   modifier_panel_end(layout, ptr);
-#endif
 }
 
 static void panelRegister(ARegionType *region_type)
@@ -1049,11 +1047,7 @@ ModifierTypeInfo modifierType_Nodes = {
     /* name */ "GeometryNodes",
     /* structName */ "NodesModifierData",
     /* structSize */ sizeof(NodesModifierData),
-#ifdef WITH_GEOMETRY_NODES
     /* srna */ &RNA_NodesModifier,
-#else
-    /* srna */ &RNA_Modifier,
-#endif
     /* type */ eModifierTypeType_Constructive,
     /* flags */
     static_cast<ModifierTypeFlag>(eModifierTypeFlag_AcceptsMesh |