sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for missing break statements in switch, some key shortcuts and notifiers were falling through when its obviously incorrect to do so.

Browse Source
This commit is contained in:
Campbell Barton 2013-07-13 14:21:36 +00:00
parent 7a3d0bac1a
commit 8ffa38b402
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/interface/interface_handlers.c
View File

@ -3721,7 +3721,7 @@ static bool ui_numedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, int mx,
break;
default:
assert(!"invalid hsv type");
BLI_assert(0);
}
hsv_to_rgb_v(hsv, rgb);
@ -3791,6 +3791,7 @@ static void ui_ndofedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, wmNDOF
hsv[2] += ndof->rx * sensitivity;
CLAMP(hsv[2], but->softmin, but->softmax);
break;
default:
assert(!"invalid hsv type");
}

1
source/blender/editors/sculpt_paint/paint_ops.c
View File

@ -695,6 +695,7 @@ static int stencil_control_modal(bContext *C, wmOperator *op, const wmEvent *eve
WM_event_add_notifier(C, NC_WINDOW, NULL);
return OPERATOR_CANCELLED;
}
break;
case XKEY:
if (event->val == KM_PRESS) {

20
source/blender/editors/space_time/space_time.c
View File

@ -403,6 +403,7 @@ static void time_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
/* mainly for updating cache display */
switch (wmn->category) {
case NC_OBJECT:
{
switch (wmn->data) {
case ND_BONE_ACTIVE:
case ND_POINTCACHE:
@ -414,7 +415,9 @@ static void time_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
break;
}
break;
}
case NC_SCENE:
{
switch (wmn->data) {
case ND_OB_ACTIVE:
case ND_FRAME:
@ -435,18 +438,26 @@ static void time_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn)
}
break;
}
break;
}
case NC_SPACE:
{
switch (wmn->data) {
case ND_SPACE_CHANGED:
ED_area_tag_refresh(sa);
break;
}
break;
}
case NC_WM:
{
switch (wmn->data) {
case ND_FILEREAD:
ED_area_tag_refresh(sa);
break;
}
break;
}
}
}
@ -568,11 +579,13 @@ static void time_header_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa),
/* context changes */
switch (wmn->category) {
case NC_SCREEN:
{
if (wmn->data == ND_ANIMPLAY)
ED_region_tag_redraw(ar);
break;
}
case NC_SCENE:
{
switch (wmn->data) {
case ND_OB_SELECT:
case ND_FRAME:
@ -582,11 +595,14 @@ static void time_header_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa),
ED_region_tag_redraw(ar);
break;
}
break;
}
case NC_SPACE:
{
if (wmn->data == ND_SPACE_TIME)
ED_region_tag_redraw(ar);
break;
}
}
}

1
source/blender/editors/space_view3d/view3d_ruler.c
View File

@ -967,6 +967,7 @@ static int view3d_ruler_modal(bContext *C, wmOperator *op, const wmEvent *event)
WM_clipboard_text_set((void *) numstr, false);
}
}
break;
}
case RIGHTCTRLKEY:
case LEFTCTRLKEY: