griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Manipulator: modal was drawing in wrong draw-step

Browse Source
This commit is contained in:
Campbell Barton
2017-08-04 09:41:45 +10:00
parent 7821bac08d
commit b156b968ae
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
View File

@@ -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;