Commit: b156b968ae9ac85948bca3a1c1cecec5a8a39433
Author: Campbell Barton
Date: Fri Aug 4 09:41:45 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBb156b968ae9ac85948bca3a1c1cecec5a8a39433
Manipulator: modal was drawing in wrong draw-step
===================================================================
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 b9946d54cee..085b7b1c787 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
@@ -306,8 +306,10 @@ static void manipulatormap_prepare_drawing(
/* only active manipulator needs updating */
if (mpr_modal) {
if ((mpr_modal->parent_mgroup->type->flag &
WM_MANIPULATORGROUPTYPE_DRAW_MODAL_ALL) == 0) {
- if (manipulator_prepare_drawing(mmap, mpr_modal, C,
draw_manipulators, drawstep)) {
- mmap->update_flag[drawstep] &=
~MANIPULATORMAP_IS_PREPARE_DRAW;
+ if
(wm_manipulatorgroup_is_visible_in_drawstep(mpr_modal->parent_mgroup,
drawstep)) {
+ if (manipulator_prepare_drawing(mmap,
mpr_modal, C, draw_manipulators, drawstep)) {
+ mmap->update_flag[drawstep] &=
~MANIPULATORMAP_IS_PREPARE_DRAW;
+ }
}
/* don't draw any other manipulators */
return;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
