[Bf-blender-cvs] [538b191a030] blender2.8: Correct last commit, for-loop included NULL check
Campbell Barton
noreply at git.blender.org
Mon Jul 31 03:25:30 CEST 2017
Commit: 538b191a03087d925f8cfe6d62080f356e04321d
Author: Campbell Barton
Date: Mon Jul 31 11:39:17 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB538b191a03087d925f8cfe6d62080f356e04321d
Correct last commit, for-loop included NULL check
===================================================================
M source/blender/editors/screen/screen_edit.c
===================================================================
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 3e4b4b501ce..d762419b550 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -856,8 +856,10 @@ static void region_cursor_set(wmWindow *win, int swinid, int swin_changed)
for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
if (ar->swinid == swinid) {
if (swin_changed || (ar->type && ar->type->event_cursor)) {
- if (WM_manipulatormap_cursor_set(ar->manipulator_map, win)) {
- return;
+ if (ar->manipulator_map != NULL) {
+ if (WM_manipulatormap_cursor_set(ar->manipulator_map, win)) {
+ return;
+ }
}
ED_region_cursor_set(win, sa, ar);
}
More information about the Bf-blender-cvs
mailing list