[Bf-blender-cvs] [ef4fbba596d] geometry-nodes: Cleanup: remove unused modifier property
Jacques Lucke
noreply at git.blender.org
Mon Oct 26 18:27:54 CET 2020
Commit: ef4fbba596df7166c71f6ef5d63129bc54bab9d7
Author: Jacques Lucke
Date: Mon Oct 26 18:27:44 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rBef4fbba596df7166c71f6ef5d63129bc54bab9d7
Cleanup: remove unused modifier property
===================================================================
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_nodes.cc
===================================================================
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index bb4aa5f2f30..553ff9fbc5d 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -2227,12 +2227,7 @@ typedef struct NodesModifierSettings {
typedef struct NodesModifierData {
ModifierData modifier;
struct bNodeTree *node_group;
-
struct NodesModifierSettings settings;
-
- /* This property exists only temporary for testing purposes. */
- float test_float_input;
- char _pad[4];
} NodesModifierData;
typedef struct MeshToVolumeModifierData {
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index d1696c8ee60..dde14f6fb47 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -6973,10 +6973,6 @@ static void rna_def_modifier_nodes(BlenderRNA *brna)
RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_ui_text(prop, "Settings", "Settings that are passed into the node group");
- prop = RNA_def_property(srna, "test_float_input", PROP_FLOAT, PROP_NONE);
- RNA_def_property_ui_text(prop, "Float Input", "Temporary float input for testing purposes");
- RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
-
RNA_define_lib_overridable(false);
rna_def_modifier_nodes_settings(brna);
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index bfded4d847a..95ab87f34c1 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -478,7 +478,6 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
uiLayoutSetPropDecorate(layout, false);
uiItemR(layout, ptr, "node_group", 0, NULL, ICON_MESH_DATA);
- uiItemR(layout, ptr, "test_float_input", 0, NULL, ICON_NONE);
modifier_panel_end(layout, ptr);
}
More information about the Bf-blender-cvs
mailing list