blender
/
blender
131
398
Fork 577
Code Issues 6.3k Pull Requests 737 Projects 19 Wiki Activity

Fix manipulator drawing before their refresh callback 

Caused glitch with Scale-Cage tool.
This commit is contained in:
Campbell Barton 2017-10-28 16:07:56 +11:00
parent ca495381c5
commit 689ad9ade4
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/windowmanager/manipulators/WM_manipulator_types.h
View File

@ -109,6 +109,7 @@ typedef enum eWM_ManipulatorGroupTypeFlag {
typedef enum eWM_ManipulatorGroupInitFlag {
/* mgroup has been initialized */
WM_MANIPULATORGROUP_INIT_SETUP = (1 << 0),
WM_MANIPULATORGROUP_INIT_REFRESH = (1 << 1),
} eWM_ManipulatorGroupInitFlag;
/**

9
source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
View File

@ -184,9 +184,16 @@ void wm_manipulatorgroup_ensure_initialized(wmManipulatorGroup *mgroup, const bC
wm_manipulatorgrouptype_setup_keymap(wgt, wm->defaultconf);
BLI_assert(wgt->keymap != NULL);
}
mgroup->init_flag |= WM_MANIPULATORGROUP_INIT_SETUP;
}
/* refresh may be called multiple times, this just ensures its called at least once before we draw. */
if (UNLIKELY((mgroup->init_flag & WM_MANIPULATORGROUP_INIT_REFRESH) == 0)) {
if (mgroup->type->refresh) {
mgroup->type->refresh(C, mgroup);
}
mgroup->init_flag |= WM_MANIPULATORGROUP_INIT_REFRESH;
}
}
bool wm_manipulatorgroup_is_visible(const wmManipulatorGroup *mgroup, const bContext *C)

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

@ -327,13 +327,14 @@ static void manipulatormap_prepare_drawing(
}
/* needs to be initialized on first draw */
wm_manipulatorgroup_ensure_initialized(mgroup, C);
/* update data if needed */
/* XXX weak: Manipulator-group may skip refreshing if it's invisible (map gets untagged nevertheless) */
if ((mmap->update_flag[drawstep] & MANIPULATORMAP_IS_REFRESH_CALLBACK) && mgroup->type->refresh) {
mgroup->type->refresh(C, mgroup);
/* cleared below */
if (mmap->update_flag[drawstep] & MANIPULATORMAP_IS_REFRESH_CALLBACK) {
/* force refresh again. */
mgroup->init_flag &= ~WM_MANIPULATORGROUP_INIT_REFRESH;
}
/* Calls `setup`, `setup_keymap` and `refresh` if they're defined. */
wm_manipulatorgroup_ensure_initialized(mgroup, C);
/* prepare drawing */
if (mgroup->type->draw_prepare) {
mgroup->type->draw_prepare(C, mgroup);