[Bf-blender-cvs] [0b8774f] master: Fix for missing break statements

Campbell Barton noreply at git.blender.org
Sun Mar 30 20:51:43 CEST 2014


Commit: 0b8774fc427267793b3fc228da4bb0ce63f6cf76
Author: Campbell Barton
Date:   Mon Mar 31 05:44:32 2014 +1100
https://developer.blender.org/rB0b8774fc427267793b3fc228da4bb0ce63f6cf76

Fix for missing break statements

===================================================================

M	source/blender/blenkernel/intern/library_query.c

===================================================================

diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 09c87c5..abc3a76 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -71,6 +71,7 @@
 		bool keep_working = callback(user_data, id_pp, cb_flag); \
 		if (flag & IDWALK_READONLY) { \
 			BLI_assert(*id_pp == old_id); \
+			(void)old_id; /* quiet warning */ \
 		} \
 		if (keep_working == false) { \
 			/* REAL DANGER! Beware of this return! */ \
@@ -194,6 +195,7 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
 			for (base = scene->base.first; base; base = base->next) {
 				CALLBACK_INVOKE(base->object, IDWALK_NOP);
 			}
+			break;
 		}
 
 		case ID_OB:
@@ -338,6 +340,7 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
 		{
 			bScreen *screen = (bScreen *) id;
 			CALLBACK_INVOKE(screen->scene, IDWALK_NOP);
+			break;
 		}
 
 		case ID_WO:
@@ -450,8 +453,8 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
 		}
 	}
 
-	#undef CALLBACK_INVOKE_ID
-	#undef CALLBACK_INVOKE
+#undef CALLBACK_INVOKE_ID
+#undef CALLBACK_INVOKE
 }
 
 #undef FOREACH_CALLBACK_INVOKE_ID




More information about the Bf-blender-cvs mailing list