[Bf-blender-cvs] [de8a19077e3] master: Cleanup: rename effec -> effector

[Campbell Barton]

Commit: de8a19077e31890cbb23a6199f0a47393406acea
Author: Campbell Barton
Date:   Tue Dec 17 14:03:46 2019 +1100
Branches: master
https://developer.blender.org/rBde8a19077e31890cbb23a6199f0a47393406acea

Cleanup: rename effec -> effector

Effector is already used elsewhere for this purpose.

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

M	release/scripts/startup/bl_ui/properties_physics_fluid.py
M	source/blender/makesrna/intern/rna_fluid.c
M	source/blender/makesrna/intern/rna_modifier.c

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

diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index b46a54fc143..0aaa9d59707 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -222,22 +222,22 @@ class PHYSICS_PT_settings(PhysicButtonsPanel, Panel):
                 col.prop_search(flow, "density_vertex_group", ob, "vertex_groups", text="Vertex Group")
 
         elif md.fluid_type == 'EFFECTOR':
-            effec = md.effec_settings
+            effector_settings = md.effector_settings
 
             row = layout.row()
-            row.prop(effec, "effec_type")
+            row.prop(effector_settings, "effector_type")
 
             flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
 
             col = flow.column()
 
-            col.prop(effec, "use_plane_init", text="Is Planar")
-            col.prop(effec, "surface_distance", text="Surface Thickness")
+            col.prop(effector_settings, "use_plane_init", text="Is Planar")
+            col.prop(effector_settings, "surface_distance", text="Surface Thickness")
 
-            if effec.effec_type == 'GUIDE':
-                col.prop(effec, "velocity_factor", text="Velocity Factor")
+            if effector_settings.effector_type == 'GUIDE':
+                col.prop(effector_settings, "velocity_factor", text="Velocity Factor")
                 col = flow.column()
-                col.prop(effec, "guide_mode", text="Guide Mode")
+                col.prop(effector_settings, "guide_mode", text="Guide Mode")
 
 
 class PHYSICS_PT_borders(PhysicButtonsPanel, Panel):
diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c
index 9a995ea4d4e..5fc5b698e83 100644
--- a/source/blender/makesrna/intern/rna_fluid.c
+++ b/source/blender/makesrna/intern/rna_fluid.c
@@ -651,7 +651,7 @@ static char *rna_FluidEffectorSettings_path(PointerRNA *ptr)
   char name_esc[sizeof(md->name) * 2];
 
   BLI_strescape(name_esc, md->name, sizeof(name_esc));
-  return BLI_sprintfN("modifiers[\"%s\"].effec_settings", name_esc);
+  return BLI_sprintfN("modifiers[\"%s\"].effector_settings", name_esc);
 }
 
 /* -------------------------------------------------------------------- */
@@ -2502,9 +2502,9 @@ static void rna_def_fluid_flow_settings(BlenderRNA *brna)
   RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset");
 }
 
-static void rna_def_fluid_effec_settings(BlenderRNA *brna)
+static void rna_def_fluid_effector_settings(BlenderRNA *brna)
 {
-  static EnumPropertyItem effec_type_items[] = {
+  static EnumPropertyItem effector_type_items[] = {
       {FLUID_EFFECTOR_TYPE_COLLISION, "COLLISION", 0, "Collision", "Create collision object"},
       {FLUID_EFFECTOR_TYPE_GUIDE, "GUIDE", 0, "Guide", "Create guide object"},
       {0, NULL, 0, NULL, NULL},
@@ -2545,9 +2545,9 @@ static void rna_def_fluid_effec_settings(BlenderRNA *brna)
   RNA_def_struct_sdna(srna, "FluidEffectorSettings");
   RNA_def_struct_path_func(srna, "rna_FluidEffectorSettings_path");
 
-  prop = RNA_def_property(srna, "effec_type", PROP_ENUM, PROP_NONE);
+  prop = RNA_def_property(srna, "effector_type", PROP_ENUM, PROP_NONE);
   RNA_def_property_enum_sdna(prop, NULL, "type");
-  RNA_def_property_enum_items(prop, effec_type_items);
+  RNA_def_property_enum_items(prop, effector_type_items);
   RNA_def_property_ui_text(prop, "Effector Type", "Change type of effector in the simulation");
   RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset");
 
@@ -2580,7 +2580,7 @@ void RNA_def_fluid(BlenderRNA *brna)
 {
   rna_def_fluid_domain_settings(brna);
   rna_def_fluid_flow_settings(brna);
-  rna_def_fluid_effec_settings(brna);
+  rna_def_fluid_effector_settings(brna);
 }
 
 #endif
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 0aa3cc1ea94..589ce1414bb 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -3633,7 +3633,7 @@ static void rna_def_modifier_fluid(BlenderRNA *brna)
   RNA_def_property_pointer_sdna(prop, NULL, "flow");
   RNA_def_property_ui_text(prop, "Flow Settings", "");
 
-  prop = RNA_def_property(srna, "effec_settings", PROP_POINTER, PROP_NONE);
+  prop = RNA_def_property(srna, "effector_settings", PROP_POINTER, PROP_NONE);
   RNA_def_property_pointer_sdna(prop, NULL, "effector");
   RNA_def_property_ui_text(prop, "Effector Settings", "");