Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-12-02 06:14:51 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-02 06:14:51 +0300
commitc00e1f68e9b81cc4972dabb869d1b6993a3bc767 (patch)
treef95ae6304cffba3c2a1b4730a1b7ea9bb0287bae /source/blender/editors/object
parenta9bd788348484fb4a62654ea3ffa60ed24b94ff3 (diff)
Cleanup: BKE_effect.h naming
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_add.c2
-rw-r--r--source/blender/editors/object/object_edit.c2
-rw-r--r--source/blender/editors/object/object_modifier.c2
3 files changed, 3 insertions, 3 deletions
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;
}