blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix crash when joining areas (caused by manipulators) 

Manipulator code tried to access the removed region from handler->op_region. Use context region now.
This commit is contained in:
Julian Eisel 2016-10-16 19:28:12 +02:00
parent 69713aa2da
commit 196654ad08
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c
View File

@ -394,10 +394,12 @@ void wm_manipulatormaps_handled_modal_update(
bContext *C, wmEvent *event, wmEventHandler *handler,
const wmOperatorType *ot)
{
ScrArea *area = CTX_wm_area(C);
ARegion *region = CTX_wm_region(C);
const bool modal_running = (handler->op != NULL);
/* happens on render */
if (!handler->op_region || !handler->op_region->manipulator_map)
/* happens on render or when joining areas */
if (!region || !region->manipulator_map)
return;
/* hide operator manipulators */
@ -405,10 +407,8 @@ void wm_manipulatormaps_handled_modal_update(
ot->mgrouptype->op = NULL;
}
wmManipulatorMap *mmap = handler->op_region->manipulator_map;
wmManipulatorMap *mmap = region->manipulator_map;
wmManipulator *manipulator = wm_manipulatormap_get_active_manipulator(mmap);
ScrArea *area = CTX_wm_area(C);
ARegion *region = CTX_wm_region(C);
wm_manipulatormap_handler_context(C, handler);