archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-12-02 14:15:43 +11:00
parent e1b8645c6a c00e1f68e9
commit 2e392a0fdc
15 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/blenkernel/BKE_effect.h
+4 -3
View File
@@ -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,
source/blender/blenkernel/intern/cloth.c
+1 -1
View File
@@ -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;
source/blender/blenkernel/intern/dynamicpaint.c
+1 -1
View File
@@ -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);
source/blender/blenkernel/intern/effect.c
+3 -3
View File
@@ -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;
source/blender/blenkernel/intern/object.c
+1 -1
View File
@@ -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);
source/blender/blenkernel/intern/particle.c
+3 -3
View File
@@ -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;
source/blender/blenkernel/intern/rigidbody.c
+1 -1
View File
@@ -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;
source/blender/blenkernel/intern/smoke.c
+1 -1
View File
@@ -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;
source/blender/blenkernel/intern/softbody.c
+1 -1
View File
@@ -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;
source/blender/blenloader/intern/readfile.c
+7 -7
View File
@@ -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);
source/blender/editors/object/object_add.c
+1 -1
View File
@@ -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));
source/blender/editors/object/object_edit.c
+1 -1
View File
@@ -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
source/blender/editors/object/object_modifier.c
+1 -1
View File
@@ -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;
}
source/blender/makesrna/intern/rna_object.c
+2 -2
View File
@@ -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);
}
source/blender/makesrna/intern/rna_particle.c
+2 -2
View File
@@ -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);
}