From c00e1f68e9b81cc4972dabb869d1b6993a3bc767 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 2 Dec 2018 14:14:51 +1100 Subject: Cleanup: BKE_effect.h naming --- source/blender/blenkernel/intern/cloth.c | 2 +- source/blender/blenkernel/intern/dynamicpaint.c | 2 +- source/blender/blenkernel/intern/effect.c | 6 +++--- source/blender/blenkernel/intern/object.c | 2 +- source/blender/blenkernel/intern/particle.c | 6 +++--- source/blender/blenkernel/intern/rigidbody.c | 2 +- source/blender/blenkernel/intern/smoke.c | 2 +- source/blender/blenkernel/intern/softbody.c | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 88d4766048f..9666b1ef68f 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -130,7 +130,7 @@ void cloth_init(ClothModifierData *clmd ) clmd->sim_parms->voxel_cell_size = 0.1f; if (!clmd->sim_parms->effector_weights) - clmd->sim_parms->effector_weights = BKE_add_effector_weights(NULL); + clmd->sim_parms->effector_weights = BKE_effector_add_weights(NULL); if (clmd->point_cache) clmd->point_cache->step = 1; diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index e129251157e..b2d389cceba 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -1057,7 +1057,7 @@ DynamicPaintSurface *dynamicPaint_createNewSurface(DynamicPaintCanvasSettings *c /* Using ID_BRUSH i18n context, as we have no physics/dpaint one for now... */ dynamicPaintSurface_setUniqueName(surface, CTX_DATA_(BLT_I18NCONTEXT_ID_BRUSH, "Surface")); - surface->effector_weights = BKE_add_effector_weights(NULL); + surface->effector_weights = BKE_effector_add_weights(NULL); dynamicPaintSurface_updateType(surface); diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 82bf65993a8..0a2d3fff073 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -82,7 +82,7 @@ #include #endif // WITH_MOD_FLUID -EffectorWeights *BKE_add_effector_weights(Group *group) +EffectorWeights *BKE_effector_add_weights(Group *group) { EffectorWeights *weights = MEM_callocN(sizeof(EffectorWeights), "EffectorWeights"); int i; @@ -97,7 +97,7 @@ EffectorWeights *BKE_add_effector_weights(Group *group) return weights; } -PartDeflect *object_add_collision_fields(int type) +PartDeflect *BKE_partdeflect_new(int type) { PartDeflect *pd; @@ -135,7 +135,7 @@ PartDeflect *object_add_collision_fields(int type) /* ***************** PARTICLES ***************** */ /* -------------------------- Effectors ------------------ */ -void free_partdeflect(PartDeflect *pd) +void BKE_partdeflect_free(PartDeflect *pd) { if (!pd) { return; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 82c86747af8..5a9ecaa7232 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -435,7 +435,7 @@ void BKE_object_free(Object *ob) BKE_constraints_free_ex(&ob->constraints, false); - free_partdeflect(ob->pd); + BKE_partdeflect_free(ob->pd); BKE_rigidbody_free_object(ob); BKE_rigidbody_free_constraint(ob); diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 40c0e1f8184..e24602050ef 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -408,8 +408,8 @@ void BKE_particlesettings_free(ParticleSettings *part) if (part->twistcurve) curvemapping_free(part->twistcurve); - free_partdeflect(part->pd); - free_partdeflect(part->pd2); + BKE_partdeflect_free(part->pd); + BKE_partdeflect_free(part->pd2); MEM_SAFE_FREE(part->effector_weights); @@ -3314,7 +3314,7 @@ static void default_particle_settings(ParticleSettings *part) part->simplify_viewport = 0.8; if (!part->effector_weights) - part->effector_weights = BKE_add_effector_weights(NULL); + part->effector_weights = BKE_effector_add_weights(NULL); part->omat = 1; part->use_modifier_stack = false; diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index 7fb313c838f..f485233fe3c 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -949,7 +949,7 @@ RigidBodyWorld *BKE_rigidbody_create_world(Scene *scene) rbw = MEM_callocN(sizeof(RigidBodyWorld), "RigidBodyWorld"); /* set default settings */ - rbw->effector_weights = BKE_add_effector_weights(NULL); + rbw->effector_weights = BKE_effector_add_weights(NULL); rbw->ltime = PSFRA; diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index ccc991ed24a..4c1d3751543 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -532,7 +532,7 @@ void smokeModifier_createType(struct SmokeModifierData *smd) smd->domain->flame_smoke_color[2] = 0.7f; smd->domain->viewsettings = MOD_SMOKE_VIEW_SHOWBIG; - smd->domain->effector_weights = BKE_add_effector_weights(NULL); + smd->domain->effector_weights = BKE_effector_add_weights(NULL); #ifdef WITH_OPENVDB_BLOSC smd->domain->openvdb_comp = VDB_COMPRESSION_BLOSC; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 940f7f72d62..9bcff23e134 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3324,7 +3324,7 @@ SoftBody *sbNew(Scene *scene) sb->pointcache = BKE_ptcache_add(&sb->ptcaches); if (!sb->effector_weights) - sb->effector_weights = BKE_add_effector_weights(NULL); + sb->effector_weights = BKE_effector_add_weights(NULL); sb->last_frame= MINFRAME-1; -- cgit v1.2.3