Commit: 1c467d77de7c693a183bda36a1dd196af2c05b81
Author: Jacques Lucke
Date: Mon May 25 11:39:52 2020 +0200
Branches: master
https://developer.blender.org/rB1c467d77de7c693a183bda36a1dd196af2c05b81
Cleanup: typo
===================================================================
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/intern/modifier.c
M source/blender/editors/mesh/editmesh_mask_extract.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/physics/particle_edit.c
M source/blender/modifiers/intern/MOD_decimate.c
M source/blender/modifiers/intern/MOD_particlesystem.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_modifier.h
b/source/blender/blenkernel/BKE_modifier.h
index a4bf86f61f3..58c0b6b71e0 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -390,7 +390,7 @@ void BKE_modifiers_foreach_ID_link(struct Object *ob,
IDWalkFunc walk, void *use
void BKE_modifiers_foreach_tex_link(struct Object *ob, TexWalkFunc walk, void
*userData);
struct ModifierData *BKE_modifiers_findby_type(struct Object *ob, ModifierType
type);
-struct ModifierData *BKE_modifiers_findny_name(struct Object *ob, const char
*name);
+struct ModifierData *BKE_modifiers_findby_name(struct Object *ob, const char
*name);
void BKE_modifiers_clear_errors(struct Object *ob);
int BKE_modifiers_get_cage_index(struct Scene *scene,
struct Object *ob,
diff --git a/source/blender/blenkernel/intern/modifier.c
b/source/blender/blenkernel/intern/modifier.c
index e872edf0784..305acf3a377 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -235,7 +235,7 @@ ModifierData *BKE_modifiers_findby_type(Object *ob,
ModifierType type)
return md;
}
-ModifierData *BKE_modifiers_findny_name(Object *ob, const char *name)
+ModifierData *BKE_modifiers_findby_name(Object *ob, const char *name)
{
return BLI_findstring(&(ob->modifiers), name, offsetof(ModifierData, name));
}
@@ -1030,5 +1030,5 @@ struct ModifierData *BKE_modifier_get_evaluated(Depsgraph
*depsgraph,
if (object_eval == object) {
return md;
}
- return BKE_modifiers_findny_name(object_eval, md->name);
+ return BKE_modifiers_findby_name(object_eval, md->name);
}
diff --git a/source/blender/editors/mesh/editmesh_mask_extract.c
b/source/blender/editors/mesh/editmesh_mask_extract.c
index eed2cbcce39..739bc5bdf7c 100644
--- a/source/blender/editors/mesh/editmesh_mask_extract.c
+++ b/source/blender/editors/mesh/editmesh_mask_extract.c
@@ -224,7 +224,7 @@ static int paint_mask_extract_exec(bContext *C, wmOperator
*op)
if (RNA_boolean_get(op->ptr, "add_solidify")) {
ED_object_modifier_add(
op->reports, bmain, scene, new_ob, "mask_extract_solidify",
eModifierType_Solidify);
- SolidifyModifierData *sfmd = (SolidifyModifierData
*)BKE_modifiers_findny_name(
+ SolidifyModifierData *sfmd = (SolidifyModifierData
*)BKE_modifiers_findby_name(
new_ob, "mask_extract_solidify");
if (sfmd) {
sfmd->offset = -0.05f;
diff --git a/source/blender/editors/object/object_modifier.c
b/source/blender/editors/object/object_modifier.c
index 5cb4714dabf..9398a5f2ce7 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -805,7 +805,7 @@ bool ED_object_modifier_apply(Main *bmain,
/* Get evaluated modifier, so object links pointer to evaluated data,
* but still use original object it is applied to the original mesh. */
Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
- ModifierData *md_eval = (ob_eval) ? BKE_modifiers_findny_name(ob_eval,
md->name) : md;
+ ModifierData *md_eval = (ob_eval) ? BKE_modifiers_findby_name(ob_eval,
md->name) : md;
/* allow apply of a not-realtime modifier, by first re-enabling realtime. */
prev_mode = md_eval->mode;
@@ -1020,7 +1020,7 @@ ModifierData *edit_modifier_property_get(wmOperator *op,
Object *ob, int type)
ModifierData *md;
RNA_string_get(op->ptr, "modifier", modifier_name);
- md = BKE_modifiers_findny_name(ob, modifier_name);
+ md = BKE_modifiers_findby_name(ob, modifier_name);
if (md && type != 0 && md->type != type) {
md = NULL;
diff --git a/source/blender/editors/physics/particle_edit.c
b/source/blender/editors/physics/particle_edit.c
index ca2dec75160..306adb36c52 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -5127,7 +5127,7 @@ void PE_create_particle_edit(
int totpoint;
if (psmd != NULL) {
- psmd_eval = (ParticleSystemModifierData
*)BKE_modifiers_findny_name(ob_eval,
+ psmd_eval = (ParticleSystemModifierData
*)BKE_modifiers_findby_name(ob_eval,
psmd->modifier.name);
}
@@ -5298,7 +5298,7 @@ static int particle_edit_toggle_exec(bContext *C,
wmOperator *op)
* with possible changes applied when object was outside of the
* edit mode. */
Object *object_eval = DEG_get_evaluated_object(depsgraph, ob);
- edit->psmd_eval = (ParticleSystemModifierData
*)BKE_modifiers_findny_name(
+ edit->psmd_eval = (ParticleSystemModifierData
*)BKE_modifiers_findby_name(
object_eval, edit->psmd->modifier.name);
recalc_emitter_field(depsgraph, ob, edit->psys);
}
diff --git a/source/blender/modifiers/intern/MOD_decimate.c
b/source/blender/modifiers/intern/MOD_decimate.c
index 3958713f7a8..2bd33af7582 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -73,7 +73,7 @@ static DecimateModifierData *getOriginalModifierData(const
DecimateModifierData
const ModifierEvalContext
*ctx)
{
Object *ob_orig = DEG_get_original_object(ctx->object);
- return (DecimateModifierData *)BKE_modifiers_findny_name(ob_orig,
dmd->modifier.name);
+ return (DecimateModifierData *)BKE_modifiers_findby_name(ob_orig,
dmd->modifier.name);
}
static void updateFaceCount(const ModifierEvalContext *ctx,
diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c
b/source/blender/modifiers/intern/MOD_particlesystem.c
index fc5359c953f..e72a484e3a0 100644
--- a/source/blender/modifiers/intern/MOD_particlesystem.c
+++ b/source/blender/modifiers/intern/MOD_particlesystem.c
@@ -216,7 +216,7 @@ static void deformVerts(ModifierData *md,
if (DEG_is_active(ctx->depsgraph)) {
Object *object_orig = DEG_get_original_object(ctx->object);
- ModifierData *md_orig = BKE_modifiers_findny_name(object_orig,
psmd->modifier.name);
+ ModifierData *md_orig = BKE_modifiers_findby_name(object_orig,
psmd->modifier.name);
BLI_assert(md_orig != NULL);
ParticleSystemModifierData *psmd_orig = (ParticleSystemModifierData
*)md_orig;
psmd_orig->flag = psmd->flag;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
