[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58217] trunk/blender/source/blender/ editors: fix for missing break statements in switch, some key shortcuts and notifiers were falling through when its obviously incorrect to do so .

Campbell Barton ideasman42 at gmail.com
Sat Jul 13 16:21:36 CEST 2013


Revision: 58217
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58217
Author:   campbellbarton
Date:     2013-07-13 14:21:36 +0000 (Sat, 13 Jul 2013)
Log Message:
-----------
fix for missing break statements in switch, some key shortcuts and notifiers were falling through when its obviously incorrect to do so.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
    trunk/blender/source/blender/editors/space_time/space_time.c
    trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-07-13 14:19:57 UTC (rev 58216)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-07-13 14:21:36 UTC (rev 58217)
@@ -3721,7 +3721,7 @@
 
 			break;
 		default:
-			assert(!"invalid hsv type");
+			BLI_assert(0);
 	}
 
 	hsv_to_rgb_v(hsv, rgb);
@@ -3791,6 +3791,7 @@
 			hsv[2] += ndof->rx * sensitivity;
 			
 			CLAMP(hsv[2], but->softmin, but->softmax);
+			break;
 		default:
 			assert(!"invalid hsv type");
 	}

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2013-07-13 14:19:57 UTC (rev 58216)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c	2013-07-13 14:21:36 UTC (rev 58217)
@@ -695,6 +695,7 @@
 				WM_event_add_notifier(C, NC_WINDOW, NULL);
 				return OPERATOR_CANCELLED;
 			}
+			break;
 		case XKEY:
 			if (event->val == KM_PRESS) {
 

Modified: trunk/blender/source/blender/editors/space_time/space_time.c
===================================================================
--- trunk/blender/source/blender/editors/space_time/space_time.c	2013-07-13 14:19:57 UTC (rev 58216)
+++ trunk/blender/source/blender/editors/space_time/space_time.c	2013-07-13 14:21:36 UTC (rev 58217)
@@ -403,6 +403,7 @@
 	/* 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 @@
 					break;
 			}
 			break;
+		}
 		case NC_SCENE:
+		{
 			switch (wmn->data) {
 				case ND_OB_ACTIVE:
 				case ND_FRAME:
@@ -435,18 +438,26 @@
 				}
 				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 @@
 	/* 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 @@
 					ED_region_tag_redraw(ar);
 					break;
 			}
-
+			break;
+		}
 		case NC_SPACE:
+		{
 			if (wmn->data == ND_SPACE_TIME)
 				ED_region_tag_redraw(ar);
 			break;
+		}
 	}
 }
 

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c	2013-07-13 14:19:57 UTC (rev 58216)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c	2013-07-13 14:21:36 UTC (rev 58217)
@@ -967,6 +967,7 @@
 					WM_clipboard_text_set((void *) numstr, false);
 				}
 			}
+			break;
 		}
 		case RIGHTCTRLKEY:
 		case LEFTCTRLKEY:




More information about the Bf-blender-cvs mailing list