diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:15:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-02 06:16:09 +0300 |
commit | 2e392a0fdc0975e500d7ea07bfbfc781f5ddd190 (patch) | |
tree | 92d23413d4573fb86f8e3da97e2f0a3f8d55f68d /source | |
parent | e1b8645c6adfb925c0c16abfb0241968d58081b4 (diff) | |
parent | c00e1f68e9b81cc4972dabb869d1b6993a3bc767 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_effect.h | 7 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/effect.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 14 | ||||
-rw-r--r-- | source/blender/editors/object/object_add.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 4 |
15 files changed, 30 insertions, 29 deletions
diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h index 3d4154c572b..9ba1bbdee07 100644 --- a/source/blender/blenkernel/BKE_effect.h +++ b/source/blender/blenkernel/BKE_effect.h @@ -47,8 +47,7 @@ struct ParticleKey; struct Depsgraph; struct ViewLayer; -struct EffectorWeights *BKE_add_effector_weights(struct Collection *collection); -struct PartDeflect *object_add_collision_fields(int type); +struct EffectorWeights *BKE_effector_add_weights(struct Collection *collection); /* Input to effector code */ typedef struct EffectedPoint { @@ -120,7 +119,9 @@ typedef struct EffectorRelation { struct PartDeflect *pd; } EffectorRelation; -void free_partdeflect(struct PartDeflect *pd); + +struct PartDeflect *BKE_partdeflect_new(int type); +void BKE_partdeflect_free(struct PartDeflect *pd); struct ListBase *BKE_effector_relations_create( struct Depsgraph *depsgraph, diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index e10cfc38164..cf5b3d3a51b 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -146,7 +146,7 @@ void cloth_init(ClothModifierData *clmd ) clmd->sim_parms->bending_model = CLOTH_BENDING_ANGULAR; 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 5453982b070..590fe559ff0 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -1039,7 +1039,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 f54082de153..0c8a47be4b4 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -87,7 +87,7 @@ #include <string.h> #endif // WITH_MOD_FLUID -EffectorWeights *BKE_add_effector_weights(Collection *collection) +EffectorWeights *BKE_effector_add_weights(Collection *collection) { EffectorWeights *weights = MEM_callocN(sizeof(EffectorWeights), "EffectorWeights"); int i; @@ -102,7 +102,7 @@ EffectorWeights *BKE_add_effector_weights(Collection *collection) return weights; } -PartDeflect *object_add_collision_fields(int type) +PartDeflect *BKE_partdeflect_new(int type) { PartDeflect *pd; @@ -140,7 +140,7 @@ PartDeflect *object_add_collision_fields(int type) /************************ PARTICLES ***************************/ -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 67edcff49a6..3e2e890f542 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -582,7 +582,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, NULL); BKE_rigidbody_free_constraint(ob); diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 6ceae2fdc2d..5a9722a867c 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -442,8 +442,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); @@ -3212,7 +3212,7 @@ static void default_particle_settings(ParticleSettings *part) part->draw_col = PART_DRAW_COL_MAT; 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 919a0c5fa02..9ca8c834bb9 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -955,7 +955,7 @@ RigidBodyWorld *BKE_rigidbody_create_world(Scene *scene) rbw->shared = MEM_callocN(sizeof(*rbw->shared), "RigidBodyWorld_Shared"); /* 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 26d9f59853c..506725c89e8 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -538,7 +538,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 4c1555e9451..2707e4eebd7 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3280,7 +3280,7 @@ SoftBody *sbNew(Scene *scene) sb->shared->pointcache = BKE_ptcache_add(&sb->shared->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 acf6ead7d96..076370c8877 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4332,7 +4332,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) { @@ -4411,7 +4411,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); @@ -5155,7 +5155,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); } } @@ -5197,7 +5197,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); @@ -5264,7 +5264,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); } } } @@ -5625,7 +5625,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); sb->shared = newdataadr(fd, sb->shared); if (sb->shared == NULL) { @@ -6516,7 +6516,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); } sce->preview = direct_link_preview_image(fd, sce->preview); diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 8abef6f6793..09948d719f0 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -587,7 +587,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); DEG_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 2723198b279..c5f55b138a6 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1197,7 +1197,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 b0047d5db8e..ec80ec98b21 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -172,7 +172,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 e2cce51fdcd..8506ff5bbd9 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1161,7 +1161,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); } @@ -1175,7 +1175,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 4e9b738bfbd..e5bd55f041c 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -1200,7 +1200,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); } @@ -1211,7 +1211,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); } |