Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-07-31 04:39:17 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-07-31 04:39:17 +0300
commit538b191a03087d925f8cfe6d62080f356e04321d (patch)
treedac2917673a99e4a92066976097d384047280264 /source/blender/editors/screen
parentac2b1663ef9616b61a2e9054330f3755cca34cff (diff)
Correct last commit, for-loop included NULL check
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/screen_edit.c6
1 files changed, 4 insertions, 2 deletions
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);
}