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/BKE_effect.h | 7 ++++--- 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 +- source/blender/blenloader/intern/readfile.c | 14 +++++++------- source/blender/editors/object/object_add.c | 2 +- source/blender/editors/object/object_edit.c | 2 +- source/blender/editors/object/object_modifier.c | 2 +- source/blender/makesrna/intern/rna_object.c | 4 ++-- source/blender/makesrna/intern/rna_particle.c | 4 ++-- 15 files changed, 30 insertions(+), 29 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h index bb5048a00f0..f12c55e762c 100644 --- a/source/blender/blenkernel/BKE_effect.h +++ b/source/blender/blenkernel/BKE_effect.h @@ -45,8 +45,7 @@ struct ParticleSimulationData; struct ParticleData; struct ParticleKey; -struct EffectorWeights *BKE_add_effector_weights(struct Group *group); -struct PartDeflect *object_add_collision_fields(int type); +struct EffectorWeights *BKE_effector_add_weights(struct Group *group); /* Input to effector code */ typedef struct EffectedPoint { @@ -109,7 +108,9 @@ typedef struct EffectorCache { int flag; } EffectorCache; -void free_partdeflect(struct PartDeflect *pd); +struct PartDeflect *BKE_partdeflect_new(int type); +void BKE_partdeflect_free(struct PartDeflect *pd); + struct ListBase *pdInitEffectors(struct Scene *scene, struct Object *ob_src, struct ParticleSystem *psys_src, struct EffectorWeights *weights, bool for_simulation); void pdEndEffectors(struct ListBase **effectors); void pdPrecalculateEffectors(struct ListBase *effectors); 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; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 57d4978c776..36221b7c60f 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4163,7 +4163,7 @@ static void lib_link_particlesettings(FileData *fd, Main *main) part->effector_weights->group = newlibadr(fd, part->id.lib, part->effector_weights->group); } else { - part->effector_weights = BKE_add_effector_weights(part->eff_group); + part->effector_weights = BKE_effector_add_weights(part->eff_group); } if (part->dupliweights.first && part->dup_group) { @@ -4274,7 +4274,7 @@ static void direct_link_particlesettings(FileData *fd, ParticleSettings *part) part->effector_weights = newdataadr(fd, part->effector_weights); if (!part->effector_weights) - part->effector_weights = BKE_add_effector_weights(part->eff_group); + part->effector_weights = BKE_effector_add_weights(part->eff_group); link_list(fd, &part->dupliweights); @@ -5167,7 +5167,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb) clmd->sim_parms->effector_weights = newdataadr(fd, clmd->sim_parms->effector_weights); 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); } } @@ -5202,7 +5202,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb) smd->domain->effector_weights = newdataadr(fd, smd->domain->effector_weights); if (!smd->domain->effector_weights) - smd->domain->effector_weights = BKE_add_effector_weights(NULL); + smd->domain->effector_weights = BKE_effector_add_weights(NULL); direct_link_pointcache_list(fd, &(smd->domain->ptcaches[0]), &(smd->domain->point_cache[0]), 1); @@ -5269,7 +5269,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb) direct_link_pointcache_list(fd, &(surface->ptcaches), &(surface->pointcache), 1); if (!(surface->effector_weights = newdataadr(fd, surface->effector_weights))) - surface->effector_weights = BKE_add_effector_weights(NULL); + surface->effector_weights = BKE_effector_add_weights(NULL); } } } @@ -5581,7 +5581,7 @@ static void direct_link_object(FileData *fd, Object *ob) sb->effector_weights = newdataadr(fd, sb->effector_weights); if (!sb->effector_weights) - sb->effector_weights = BKE_add_effector_weights(NULL); + sb->effector_weights = BKE_effector_add_weights(NULL); direct_link_pointcache_list(fd, &sb->ptcaches, &sb->pointcache, 0); } @@ -6257,7 +6257,7 @@ static void direct_link_scene(FileData *fd, Scene *sce) /* set effector weights */ rbw->effector_weights = newdataadr(fd, rbw->effector_weights); if (!rbw->effector_weights) - rbw->effector_weights = BKE_add_effector_weights(NULL); + rbw->effector_weights = BKE_effector_add_weights(NULL); /* link cache */ direct_link_pointcache_list(fd, &rbw->ptcaches, &rbw->pointcache, false); diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index efc69c36cc3..a05f40765fa 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -534,7 +534,7 @@ static int effector_add_exec(bContext *C, wmOperator *op) ob->empty_drawtype = OB_SINGLE_ARROW; } - ob->pd = object_add_collision_fields(type); + ob->pd = BKE_partdeflect_new(type); DAG_relations_tag_update(CTX_data_main(C)); diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index fc967dc424e..b4e17ce3528 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1216,7 +1216,7 @@ static int forcefield_toggle_exec(bContext *C, wmOperator *UNUSED(op)) Object *ob = CTX_data_active_object(C); if (ob->pd == NULL) - ob->pd = object_add_collision_fields(PFIELD_FORCE); + ob->pd = BKE_partdeflect_new(PFIELD_FORCE); else if (ob->pd->forcefield == 0) ob->pd->forcefield = PFIELD_FORCE; else diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 5f3a6d0ac94..27672a1102b 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -149,7 +149,7 @@ ModifierData *ED_object_modifier_add(ReportList *reports, Main *bmain, Scene *sc } else if (type == eModifierType_Collision) { if (!ob->pd) - ob->pd = object_add_collision_fields(0); + ob->pd = BKE_partdeflect_new(0); ob->pd->deflect = 1; } diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 4094552d9bc..47ab35d3213 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1298,7 +1298,7 @@ static PointerRNA rna_Object_field_get(PointerRNA *ptr) /* weak */ if (!ob->pd) - ob->pd = object_add_collision_fields(0); + ob->pd = BKE_partdeflect_new(0); return rna_pointer_inherit_refine(ptr, &RNA_FieldSettings, ob->pd); } @@ -1312,7 +1312,7 @@ static PointerRNA rna_Object_collision_get(PointerRNA *ptr) /* weak */ if (!ob->pd) - ob->pd = object_add_collision_fields(0); + ob->pd = BKE_partdeflect_new(0); return rna_pointer_inherit_refine(ptr, &RNA_CollisionSettings, ob->pd); } diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 05fd0ee740e..cf6905ea914 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -1229,7 +1229,7 @@ static PointerRNA rna_Particle_field1_get(PointerRNA *ptr) /* weak */ if (!part->pd) - part->pd = object_add_collision_fields(0); + part->pd = BKE_partdeflect_new(0); return rna_pointer_inherit_refine(ptr, &RNA_FieldSettings, part->pd); } @@ -1240,7 +1240,7 @@ static PointerRNA rna_Particle_field2_get(PointerRNA *ptr) /* weak */ if (!part->pd2) - part->pd2 = object_add_collision_fields(0); + part->pd2 = BKE_partdeflect_new(0); return rna_pointer_inherit_refine(ptr, &RNA_FieldSettings, part->pd2); } -- cgit v1.2.3