diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-04 02:41:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-04 02:41:45 +0300 |
| commit | b156b968ae9ac85948bca3a1c1cecec5a8a39433 (patch) | |
| tree | 8465acb414ec9275a3d2e653bbc8d257c9d494dd /source/blender/windowmanager | |
| parent | 7821bac08d6faaac05f2b491825c61a7f74ce1d5 (diff) | |
Manipulator: modal was drawing in wrong draw-step
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c | 6 |
1 files changed, 4 insertions, 2 deletions
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; |