Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dalai@blender.org>2020-11-18 03:53:37 +0300
committerJacques Lucke <jacques@blender.org>2020-12-02 17:38:47 +0300
commit3d3a20d6d18afe691db631acc61a0c8251d12137 (patch)
treef3684728c87f52bea92f63a12bfb34a4544e905a /source/blender/modifiers
parentdc614c68ef2c8ca8b076a000974b5a20a4145a42 (diff)
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.
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_nodes.cc6
1 files changed, 0 insertions, 6 deletions
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 |