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:
authorAntony Riakiotakis <kalast@gmail.com>2014-03-12 23:06:57 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-03-12 23:06:57 +0400
commitdeef641878721438f39504aeef77c814500f37bb (patch)
treeacbc513d0b0c383cc4f9fbeca451716d70414831 /source/blender/editors/interface/interface_regions.c
parentfbf859518acfa8aabbb908447d5d96640c328ea2 (diff)
Anticipate future color picker types and don't crash (uiBut could be
NULL in some cases)
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
-rw-r--r--source/blender/editors/interface/interface_regions.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index f92d87b2ed7..0e966aaaa7d 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1910,6 +1910,9 @@ static void uiBlockPicker(uiBlock *block, float rgba[4], PointerRNA *ptr, Proper
case USER_CP_SQUARE_HV:
square_picker(block, ptr, prop, UI_GRAD_HV);
break;
+ default:
+ circle_picker(block, ptr, prop);
+ break;
}
/* mode */