blender
/
blender
131
398
Fork 577
Code Issues 6.2k Pull Requests 743 Projects 19 Wiki Activity

Cleanup: BKE_effect.h naming

This commit is contained in:
Campbell Barton 2018-12-02 14:14:51 +11:00
parent a9bd788348
commit c00e1f68e9
15 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/BKE_effect.h
View File

@ -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);

2
source/blender/blenkernel/intern/cloth.c
View File

@ -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;

2
source/blender/blenkernel/intern/dynamicpaint.c
View File

@ -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);

6
source/blender/blenkernel/intern/effect.c
View File

@ -82,7 +82,7 @@
#include <string.h>
#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;

2
source/blender/blenkernel/intern/object.c
View File

@ -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);

6
source/blender/blenkernel/intern/particle.c
View File

@ -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;

2
source/blender/blenkernel/intern/rigidbody.c
View File

@ -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;

2
source/blender/blenkernel/intern/smoke.c
View File

@ -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;

2
source/blender/blenkernel/intern/softbody.c
View File

@ -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;

14
source/blender/blenloader/intern/readfile.c
View File

@ -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);

2
source/blender/editors/object/object_add.c
View File

@ -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));

2
source/blender/editors/object/object_edit.c
View File

@ -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

2
source/blender/editors/object/object_modifier.c
View File

@ -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;
}

4
source/blender/makesrna/intern/rna_object.c
View File

@ -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);
}

4
source/blender/makesrna/intern/rna_particle.c
View File

@ -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);
}