[Bf-blender-cvs] [c2d5411cbfe] blender2.8: Fix manipulator removal

Campbell Barton noreply at git.blender.org
Fri May 18 17:37:45 CEST 2018


Commit: c2d5411cbfe2da4b4a274a8695cec8a024cad886
Author: Campbell Barton
Date:   Fri May 18 17:29:43 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc2d5411cbfe2da4b4a274a8695cec8a024cad886

Fix manipulator removal

The flag could be left set, removing the manipulator type again.

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

M	source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c

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

diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
index da55db9db00..ab8c797df69 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
@@ -1151,6 +1151,7 @@ void WM_manipulatorconfig_update(struct Main *bmain)
 				{
 					wgt_ref_next = wgt_ref->next;
 					if (wgt_ref->type->type_update_flag & WM_MANIPULATORMAPTYPE_UPDATE_REMOVE) {
+						wgt_ref->type->type_update_flag &= ~WM_MANIPULATORMAPTYPE_UPDATE_REMOVE;
 						WM_manipulatormaptype_group_unlink(NULL, bmain, mmap_type, wgt_ref->type);
 					}
 				}



More information about the Bf-blender-cvs mailing list