[Bf-blender-cvs] [9e762693db1] blender2.8: Fix manipulator remove tag, it cleared all groups
Campbell Barton
noreply at git.blender.org
Fri Aug 25 07:15:54 CEST 2017
Commit: 9e762693db15f815e93714ac018083676bc908f7
Author: Campbell Barton
Date: Fri Aug 25 15:19:30 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB9e762693db15f815e93714ac018083676bc908f7
Fix manipulator remove tag, it cleared all groups
===================================================================
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 cece24df85f..51ad133daed 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
@@ -1046,7 +1046,9 @@ void WM_manipulatorconfig_update(struct Main *bmain)
wgt_ref = wgt_ref_next)
{
wgt_ref_next = wgt_ref->next;
- WM_manipulatormaptype_group_unlink(NULL, bmain, mmap_type, wgt_ref->type);
+ if (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