[Bf-blender-cvs] [f7e0f429e2e] functions: remove unused modifier properties

[Jacques Lucke]

Commit: f7e0f429e2efd916e54217e1cabc48c151f0f9eb
Author: Jacques Lucke
Date:   Fri Jul 5 18:07:12 2019 +0200
Branches: functions
https://developer.blender.org/rBf7e0f429e2efd916e54217e1cabc48c151f0f9eb

remove unused modifier properties

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

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/makesdna/DNA_modifier_types.h
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/intern/MOD_nodeparticles.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 1aa828a35fb..333fc68ceb6 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1664,10 +1664,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         props.modifier_name = md.name
 
     def NODE_PARTICLES(self, layout, ob, md):
-        layout.prop(md, "control1")
-        layout.prop(md, "control2")
-        layout.prop(md, "emitter_object")
-        layout.prop(md, "collision_object")
         layout.prop(md, "bparticles_tree")
 
 
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 399df9f936d..03e0d5ff895 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1966,10 +1966,6 @@ typedef struct FunctionPointsModifierData {
 
 typedef struct NodeParticlesModifierData {
   ModifierData modifier;
-  float control1, control2;
-  struct Object *emitter_object;
-  struct Object *collision_object;
-  float last_emitter_transforms[4][4];
   struct bNodeTree *bparticles_tree;
 } NodeParticlesModifierData;
 
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 843b60ee041..6fb2e1c4991 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -5983,22 +5983,6 @@ static void rna_def_modifier_node_particles(BlenderRNA *brna)
   RNA_def_struct_sdna(srna, "NodeParticlesModifierData");
   RNA_def_struct_ui_icon(srna, ICON_NONE);
 
-  prop = RNA_def_float(srna, "control1", 0.0, -FLT_MAX, FLT_MAX, "Control 1", "", -10, 10);
-  RNA_def_property_update(prop, 0, "rna_Modifier_update");
-
-  prop = RNA_def_float(srna, "control2", 0.0, -FLT_MAX, FLT_MAX, "Control 2", "", -10, 10);
-  RNA_def_property_update(prop, 0, "rna_Modifier_update");
-
-  prop = RNA_def_property(srna, "emitter_object", PROP_POINTER, PROP_NONE);
-  RNA_def_property_flag(prop, PROP_EDITABLE);
-  RNA_def_property_ui_text(prop, "Emitter Object", "Object to emit from");
-  RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
-
-  prop = RNA_def_property(srna, "collision_object", PROP_POINTER, PROP_NONE);
-  RNA_def_property_flag(prop, PROP_EDITABLE);
-  RNA_def_property_ui_text(prop, "Collision Object", "Object to collide with");
-  RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
-
   prop = RNA_def_property(srna, "bparticles_tree", PROP_POINTER, PROP_NONE);
   RNA_def_property_flag(prop, PROP_EDITABLE);
   RNA_def_property_ui_text(prop, "BParticles Tree", "BParticles node tree");
diff --git a/source/blender/modifiers/intern/MOD_nodeparticles.c b/source/blender/modifiers/intern/MOD_nodeparticles.c
index 32d06e75dee..428933c73f5 100644
--- a/source/blender/modifiers/intern/MOD_nodeparticles.c
+++ b/source/blender/modifiers/intern/MOD_nodeparticles.c
@@ -182,10 +182,8 @@ static Mesh *applyModifier(ModifierData *md,
   return point_mesh_from_particle_state(runtime->state);
 }
 
-static void initData(ModifierData *md)
+static void initData(ModifierData *UNUSED(md))
 {
-  NodeParticlesModifierData *npmd = (NodeParticlesModifierData *)md;
-  npmd->control1 = 0.02f;
 }
 
 static void freeData(ModifierData *md)
@@ -208,24 +206,16 @@ static bool dependsOnTime(ModifierData *UNUSED(md))
   return true;
 }
 
-static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
+static void updateDepsgraph(ModifierData *UNUSED(md),
+                            const ModifierUpdateDepsgraphContext *UNUSED(ctx))
 {
-  NodeParticlesModifierData *npmd = (NodeParticlesModifierData *)md;
-  if (npmd->emitter_object) {
-    DEG_add_object_relation(
-        ctx->node, npmd->emitter_object, DEG_OB_COMP_GEOMETRY, "Modifier Emitter");
-  }
-  if (npmd->collision_object) {
-    DEG_add_object_relation(
-        ctx->node, npmd->collision_object, DEG_OB_COMP_GEOMETRY, "Modifer Collision");
-  }
 }
 
-static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, void *userData)
+static void foreachObjectLink(ModifierData *UNUSED(md),
+                              Object *UNUSED(ob),
+                              ObjectWalkFunc UNUSED(walk),
+                              void *UNUSED(userData))
 {
-  NodeParticlesModifierData *npmd = (NodeParticlesModifierData *)md;
-  walk(userData, ob, &npmd->emitter_object, IDWALK_CB_NOP);
-  walk(userData, ob, &npmd->collision_object, IDWALK_CB_NOP);
 }
 
 static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData)