[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59254] trunk/blender: style cleanup: indent/whitespace

Campbell Barton ideasman42 at gmail.com
Mon Aug 19 03:48:45 CEST 2013


Revision: 59254
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59254
Author:   campbellbarton
Date:     2013-08-19 01:48:44 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
style cleanup: indent/whitespace

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
    trunk/blender/intern/opencolorio/ocio_impl.cc
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
    trunk/blender/source/blender/freestyle/intern/stroke/StrokeShader.h
    trunk/blender/source/gameengine/GameLogic/SCA_IScene.cpp
    trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2013-08-19 01:38:14 UTC (rev 59253)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2013-08-19 01:48:44 UTC (rev 59254)
@@ -1110,7 +1110,7 @@
 					event = processWindowEvent(LOWORD(wParam) ? GHOST_kEventWindowActivate : GHOST_kEventWindowDeactivate, window);
 					/* WARNING: Let DefWindowProc handle WM_ACTIVATE, otherwise WM_MOUSEWHEEL
 					 * will not be dispatched to OUR active window if we minimize one of OUR windows. */
-					if(LOWORD(wParam)==WA_INACTIVE)
+					if (LOWORD(wParam)==WA_INACTIVE)
 						window->lostMouseCapture();
 
 					lResult = ::DefWindowProc(hwnd, msg, wParam, lParam);
@@ -1136,10 +1136,9 @@
 					 * function when the application obtains a WM_PAINT message by using the GetMessage or 
 					 * PeekMessage function. 
 					 */
-					if(!window->m_inLiveResize)
-					{
-					event = processWindowEvent(GHOST_kEventWindowUpdate, window);
-					::ValidateRect(hwnd, NULL);
+					if (!window->m_inLiveResize) {
+						event = processWindowEvent(GHOST_kEventWindowUpdate, window);
+						::ValidateRect(hwnd, NULL);
 					}
 					else {
 						eventHandled = true;
@@ -1163,15 +1162,13 @@
 					 * message without calling DefWindowProc.
 					 */
 					/* we get first WM_SIZE before we fully init. So, do not dispatch before we continiously resizng */
-						if(window->m_inLiveResize)
-						{
-							system->pushEvent(processWindowEvent(GHOST_kEventWindowSize, window));
-							system->dispatchEvents();
-						}
-						else
-						{
-							event = processWindowEvent(GHOST_kEventWindowSize, window);
-						}
+					if(window->m_inLiveResize) {
+						system->pushEvent(processWindowEvent(GHOST_kEventWindowSize, window));
+						system->dispatchEvents();
+					}
+					else {
+						event = processWindowEvent(GHOST_kEventWindowSize, window);
+					}
 					break;
 				case WM_CAPTURECHANGED:
 					window->lostMouseCapture();
@@ -1187,16 +1184,14 @@
 					 * to perform any move or size change processing during the WM_WINDOWPOSCHANGED 
 					 * message without calling DefWindowProc. 
 					 */
-						/* see WM_SIZE comment*/
-						if(window->m_inLiveResize)
-						{
-							system->pushEvent(processWindowEvent(GHOST_kEventWindowMove, window));
-							system->dispatchEvents();
-						}						
-						else
-						{
-							event = processWindowEvent(GHOST_kEventWindowMove, window);
-						}
+					/* see WM_SIZE comment*/
+					if (window->m_inLiveResize) {
+						system->pushEvent(processWindowEvent(GHOST_kEventWindowMove, window));
+						system->dispatchEvents();
+					}
+					else {
+						event = processWindowEvent(GHOST_kEventWindowMove, window);
+					}
 
 					break;
 				////////////////////////////////////////////////////////////////////////

Modified: trunk/blender/intern/opencolorio/ocio_impl.cc
===================================================================
--- trunk/blender/intern/opencolorio/ocio_impl.cc	2013-08-19 01:38:14 UTC (rev 59253)
+++ trunk/blender/intern/opencolorio/ocio_impl.cc	2013-08-19 01:48:44 UTC (rev 59254)
@@ -56,7 +56,7 @@
 #endif
 
 #define MEM_NEW(type) new(MEM_mallocN(sizeof(type), __func__)) type()
-#define MEM_DELETE(what, type) if(what) { ((type*)(what))->~type(); MEM_freeN(what); } (void)0
+#define MEM_DELETE(what, type) if (what) { ((type*)(what))->~type(); MEM_freeN(what); } (void)0
 
 static const int LUT3D_EDGE_SIZE = 32;
 

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2013-08-19 01:38:14 UTC (rev 59253)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2013-08-19 01:48:44 UTC (rev 59254)
@@ -5443,10 +5443,10 @@
 	link_list(fd, &(sce->transform_spaces));
 	link_list(fd, &(sce->r.layers));
 
-	for(srl = sce->r.layers.first; srl; srl = srl->next) {
+	for (srl = sce->r.layers.first; srl; srl = srl->next) {
 		link_list(fd, &(srl->freestyleConfig.modules));
 	}
-	for(srl = sce->r.layers.first; srl; srl = srl->next) {
+	for (srl = sce->r.layers.first; srl; srl = srl->next) {
 		link_list(fd, &(srl->freestyleConfig.linesets));
 	}
 	
@@ -7033,16 +7033,16 @@
 	linestyle->adt= newdataadr(fd, linestyle->adt);
 	direct_link_animdata(fd, linestyle->adt);
 	link_list(fd, &linestyle->color_modifiers);
-	for(modifier = linestyle->color_modifiers.first; modifier; modifier = modifier->next)
+	for (modifier = linestyle->color_modifiers.first; modifier; modifier = modifier->next)
 		direct_link_linestyle_color_modifier(fd, modifier);
 	link_list(fd, &linestyle->alpha_modifiers);
-	for(modifier = linestyle->alpha_modifiers.first; modifier; modifier = modifier->next)
+	for (modifier = linestyle->alpha_modifiers.first; modifier; modifier = modifier->next)
 		direct_link_linestyle_alpha_modifier(fd, modifier);
 	link_list(fd, &linestyle->thickness_modifiers);
-	for(modifier = linestyle->thickness_modifiers.first; modifier; modifier = modifier->next)
+	for (modifier = linestyle->thickness_modifiers.first; modifier; modifier = modifier->next)
 		direct_link_linestyle_thickness_modifier(fd, modifier);
 	link_list(fd, &linestyle->geometry_modifiers);
-	for(modifier = linestyle->geometry_modifiers.first; modifier; modifier = modifier->next)
+	for (modifier = linestyle->geometry_modifiers.first; modifier; modifier = modifier->next)
 		direct_link_linestyle_geometry_modifier(fd, modifier);
 }
 
@@ -9455,12 +9455,12 @@
 		SceneRenderLayer *srl;
 		FreestyleLineStyle *linestyle;
 
-		for(sce = main->scene.first; sce; sce = sce->id.next) {
+		for (sce = main->scene.first; sce; sce = sce->id.next) {
 			if (sce->r.line_thickness_mode == 0) {
 				sce->r.line_thickness_mode = R_LINE_THICKNESS_ABSOLUTE;
 				sce->r.unit_line_thickness = 1.0f;
 			}
-			for(srl = sce->r.layers.first; srl; srl = srl->next) {
+			for (srl = sce->r.layers.first; srl; srl = srl->next) {
 				if (srl->freestyleConfig.mode == 0)
 					srl->freestyleConfig.mode = FREESTYLE_CONTROL_EDITOR_MODE;
 				if (srl->freestyleConfig.raycasting_algorithm == FREESTYLE_ALGO_CULLED_ADAPTIVE_CUMULATIVE ||
@@ -9490,7 +9490,7 @@
 			}
 
 		}
-		for(linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
+		for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
 #if 1
 			/* disable the Misc panel for now */
 			if (linestyle->panel == LS_PANEL_MISC) {
@@ -9578,11 +9578,11 @@
 		for (brush = main->brush.first; brush; brush = brush->id.next) {
 			brush->flag &= ~BRUSH_FIXED;
 
-			if(brush->cursor_overlay_alpha < 2)
+			if (brush->cursor_overlay_alpha < 2)
 				brush->cursor_overlay_alpha = 33;
-			if(brush->texture_overlay_alpha < 2)
+			if (brush->texture_overlay_alpha < 2)
 				brush->texture_overlay_alpha = 33;
-			if(brush->mask_overlay_alpha <2)
+			if (brush->mask_overlay_alpha <2)
 				brush->mask_overlay_alpha = 33;
 		}
 		#undef BRUSH_FIXED

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2013-08-19 01:38:14 UTC (rev 59253)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2013-08-19 01:48:44 UTC (rev 59254)
@@ -1714,14 +1714,14 @@
 
 #ifdef DEBUG
 	/* check flag isn't already set */
-	for(i = 0; i < len; i++) {
+	for (i = 0; i < len; i++) {
 		BM_ITER_ELEM (f, &viter, varr[i], BM_FACES_OF_VERT) {
 			BLI_assert(BM_ELEM_API_FLAG_TEST(f, _FLAG_OVERLAP) == 0);
 		}
 	}
 #endif
 
-	for(i = 0; i < len; i++) {
+	for (i = 0; i < len; i++) {
 		BM_ITER_ELEM (f, &viter, varr[i], BM_FACES_OF_VERT) {
 			if (BM_ELEM_API_FLAG_TEST(f, _FLAG_OVERLAP) == 0) {
 				if (len <= BM_verts_in_face_count(f, varr, len)) {
@@ -1764,7 +1764,7 @@
 
 #ifdef DEBUG
 	/* check flag isn't already set */
-	for(i = 0; i < len; i++) {
+	for (i = 0; i < len; i++) {
 		BLI_assert(BM_ELEM_API_FLAG_TEST(varr[i], _FLAG_OVERLAP) == 0);
 		BM_ITER_ELEM (f, &viter, varr[i], BM_FACES_OF_VERT) {
 			BLI_assert(BM_ELEM_API_FLAG_TEST(f, _FLAG_OVERLAP) == 0);
@@ -1772,7 +1772,7 @@
 	}
 #endif
 
-	for(i = 0; i < len; i++) {
+	for (i = 0; i < len; i++) {
 		BM_ITER_ELEM (f, &viter, varr[i], BM_FACES_OF_VERT) {
 			if ((f->len <= len) && (BM_ELEM_API_FLAG_TEST(f, _FLAG_OVERLAP) == 0)) {
 				/* check if all vers in this face are flagged*/
@@ -1780,7 +1780,7 @@
 
 				if (is_init == false) {
 					is_init = true;
-					for(i = 0; i < len; i++) {
+					for (i = 0; i < len; i++) {
 						BM_ELEM_API_FLAG_ENABLE(varr[i], _FLAG_OVERLAP);
 					}
 				}
@@ -1805,7 +1805,7 @@
 	}
 
 	if (is_init == true) {
-		for(i = 0; i < len; i++) {
+		for (i = 0; i < len; i++) {
 			BM_ELEM_API_FLAG_DISABLE(varr[i], _FLAG_OVERLAP);
 		}
 	}

Modified: trunk/blender/source/blender/freestyle/intern/stroke/StrokeShader.h
===================================================================
--- trunk/blender/source/blender/freestyle/intern/stroke/StrokeShader.h	2013-08-19 01:38:14 UTC (rev 59253)
+++ trunk/blender/source/blender/freestyle/intern/stroke/StrokeShader.h	2013-08-19 01:48:44 UTC (rev 59254)
@@ -63,7 +63,7 @@
  *  \endcode
  *  Here is a C++ code example of such an iteration:
  *  \code
- *  for(StrokeInternal::StrokeVertexIterator v = ioStroke.strokeVerticesBegin(), vend = ioStroke.strokeVerticesEnd();
+ *  for (StrokeInternal::StrokeVertexIterator v = ioStroke.strokeVerticesBegin(), vend = ioStroke.strokeVerticesEnd();
  *      v != vend;
  *      ++v)
  *  {

Modified: trunk/blender/source/gameengine/GameLogic/SCA_IScene.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_IScene.cpp	2013-08-19 01:38:14 UTC (rev 59253)
+++ trunk/blender/source/gameengine/GameLogic/SCA_IScene.cpp	2013-08-19 01:48:44 UTC (rev 59254)
@@ -87,7 +87,7 @@
 void SCA_IScene::RemoveObjectDebugProperties(class CValue* gameobj)
 {	
 	vector<SCA_DebugProp*>::iterator it = m_debugList.begin();
-	while(it != m_debugList.end()) {
+	while (it != m_debugList.end()) {
 		CValue* debugobj = (*it)->m_obj;
 
 		if (debugobj == gameobj) {

Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp	2013-08-19 01:38:14 UTC (rev 59253)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list