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:
authorLukas Tönne <lukas.toenne@gmail.com>2014-05-08 10:11:53 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2014-05-08 10:13:55 +0400
commitcd60c18be17d31a651fc449b35657c1c3cdc845d (patch)
tree0911523b5db4c73a89d8cf12edb6ad06891114cc /source/blender/editors
parent49cde5d8c10726907eaa6790e70b04f4158c4fe5 (diff)
Fix T40080: forcefield_toggle_exec() doesn't always enable force field.
Kudos to Brent Baccala for investigating and suggesting a fix.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/object/object_edit.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index b5d70225c43..002bec4ef0b 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1127,8 +1127,7 @@ static int forcefield_toggle_exec(bContext *C, wmOperator *UNUSED(op))
if (ob->pd == NULL)
ob->pd = object_add_collision_fields(PFIELD_FORCE);
-
- if (ob->pd->forcefield == 0)
+ else if (ob->pd->forcefield == 0)
ob->pd->forcefield = PFIELD_FORCE;
else
ob->pd->forcefield = 0;