[Bf-blender-cvs] [894513c7fd5] master: Fix (unreported): Crash if a right click is performed on an image datablock (open btn f.e.).
Thomas Beck
noreply at git.blender.org
Tue May 9 20:16:13 CEST 2017
Commit: 894513c7fd561bacc21079891a80be7b640f29a1
Author: Thomas Beck
Date: Tue May 9 20:12:25 2017 +0200
Branches: master
https://developer.blender.org/rB894513c7fd561bacc21079891a80be7b640f29a1
Fix (unreported): Crash if a right click is performed on an image datablock (open btn f.e.).
Only access/insert the button_pointer if it's not null...
===================================================================
M source/blender/editors/interface/interface_handlers.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index b50789ff897..bb30f827294 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -7012,7 +7012,8 @@ static bool ui_but_menu(bContext *C, uiBut *but)
}
/* Set the operator pointer for python access */
- uiLayoutSetContextPointer(layout,"button_operator", but->opptr);
+ if (but->opptr)
+ uiLayoutSetContextPointer(layout,"button_operator", but->opptr);
uiItemS(layout);
}
More information about the Bf-blender-cvs
mailing list