[Bf-blender-cvs] [cd60c18b] master: Fix T40080: forcefield_toggle_exec() doesn't always enable force field.

[Lukas Tönne]

Commit: cd60c18be17d31a651fc449b35657c1c3cdc845d
Author: Lukas Tönne
Date:   Thu May 8 08:11:53 2014 +0200
https://developer.blender.org/rBcd60c18be17d31a651fc449b35657c1c3cdc845d

Fix T40080: forcefield_toggle_exec() doesn't always enable force field.

Kudos to Brent Baccala for investigating and suggesting a fix.

===================================================================

M	source/blender/editors/object/object_edit.c

===================================================================

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index b5d7022..002bec4 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;