diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-12-17 06:03:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-12-17 06:06:47 +0300 |
commit | de8a19077e31890cbb23a6199f0a47393406acea (patch) | |
tree | cec4b1cb128a4f799ff00264ce14932013200082 /source/blender/makesrna | |
parent | ca277d7d6073b0ead3c38c028ab74b05d5728fea (diff) |
Cleanup: rename effec -> effector
Effector is already used elsewhere for this purpose.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_fluid.c | 12 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 |
2 files changed, 7 insertions, 7 deletions
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", ""); |