[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51804] trunk/blender/source: style cleanup

Campbell Barton ideasman42 at gmail.com
Thu Nov 1 10:54:02 CET 2012


Revision: 51804
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51804
Author:   campbellbarton
Date:     2012-11-01 09:54:00 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/blenkernel/intern/unit.c
    trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
    trunk/blender/source/blender/blenlib/intern/noise.c
    trunk/blender/source/blender/bmesh/operators/bmo_similar.c
    trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c
    trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    trunk/blender/source/blender/compositor/intern/COM_NodeOperation.h
    trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp
    trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.h
    trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    trunk/blender/source/blender/editors/interface/interface_handlers.c
    trunk/blender/source/blender/editors/interface/interface_widgets.c
    trunk/blender/source/blender/editors/mask/mask_draw.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
    trunk/blender/source/blender/editors/util/crazyspace.c
    trunk/blender/source/blender/gpu/intern/gpu_extensions.c
    trunk/blender/source/blender/imbuf/intern/indexer.c
    trunk/blender/source/blender/makesrna/intern/rna_main.c
    trunk/blender/source/blender/makesrna/intern/rna_main_api.c
    trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c
    trunk/blender/source/blender/makesrna/intern/rna_object_api.c
    trunk/blender/source/blender/makesrna/intern/rna_render.c
    trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c
    trunk/blender/source/blender/makesrna/intern/rna_tracking.c
    trunk/blender/source/tools/check_style_c.py

Added Paths:
-----------
    trunk/blender/source/tools/check_style_c_config.py

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2012-11-01 06:38:25 UTC (rev 51803)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2012-11-01 09:54:00 UTC (rev 51804)
@@ -304,7 +304,7 @@
 	if (ob->data) {
 		ID *id = ob->data;
 		id->us--;
-		if (id->us == 0 && id->lib==NULL) {
+		if (id->us == 0 && id->lib == NULL) {
 			switch (ob->type) {
 				case OB_MESH:
 					BKE_mesh_unlink((Mesh *)id);

Modified: trunk/blender/source/blender/blenkernel/intern/unit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/unit.c	2012-11-01 06:38:25 UTC (rev 51803)
+++ trunk/blender/source/blender/blenkernel/intern/unit.c	2012-11-01 09:54:00 UTC (rev 51804)
@@ -259,7 +259,7 @@
 
 
 static struct bUnitDef buNaturalRotDef[] = {
-	{"degree", "degrees",			"°", NULL, "Degrees",		M_PI/180.0, 0.0,	B_UNIT_DEF_NONE},
+	{"degree", "degrees",			"°", NULL, "Degrees",		M_PI / 180.0, 0.0,	B_UNIT_DEF_NONE},
 //	{"radian", "radians",			"r", NULL, "Radians",		1.0, 0.0,			B_UNIT_DEF_NONE},
 //	{"turn", "turns",				"t", NULL, "Turns",			1.0/(M_PI*2.0), 0.0,B_UNIT_DEF_NONE},
 	{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}

Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c	2012-11-01 06:38:25 UTC (rev 51803)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c	2012-11-01 09:54:00 UTC (rev 51804)
@@ -1104,7 +1104,9 @@
 	if (!tree_overlap(tree1->nodes[tree1->totleaf], tree2->nodes[tree2->totleaf],
 	                  min_axis(tree1->start_axis, tree2->start_axis),
 	                  min_axis(tree1->stop_axis, tree2->stop_axis)))
+	{
 		return NULL;
+	}
 
 	data = MEM_callocN(sizeof(BVHOverlapData *) * tree1->tree_type, "BVHOverlapData_star");
 	

Modified: trunk/blender/source/blender/blenlib/intern/noise.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/noise.c	2012-11-01 06:38:25 UTC (rev 51803)
+++ trunk/blender/source/blender/blenlib/intern/noise.c	2012-11-01 09:54:00 UTC (rev 51804)
@@ -301,8 +301,8 @@
 	u = npfade(x);      /* COMPUTE FADE CURVES */
 	v = npfade(y);      /* FOR EACH OF X,Y,Z. */
 	w = npfade(z);
-	A = hash[X  ]+Y;  AA = hash[A]+Z;  AB = hash[A+1]+Z;      /* HASH COORDINATES OF */
-	B = hash[X+1]+Y;  BA = hash[B]+Z;  BB = hash[B+1]+Z;      /* THE 8 CUBE CORNERS, */
+	A = hash[X    ] + Y;  AA = hash[A] + Z;  AB = hash[A + 1] + Z;      /* HASH COORDINATES OF */
+	B = hash[X + 1] + Y;  BA = hash[B] + Z;  BB = hash[B + 1] + Z;      /* THE 8 CUBE CORNERS, */
 	return lerp(w, lerp(v, lerp(u, grad(hash[AA   ],  x,     y,     z    ),   /* AND ADD */
 	                               grad(hash[BA   ],  x - 1, y,     z    )),  /* BLENDED */
 	                       lerp(u, grad(hash[AB   ],  x,     y - 1, z    ),   /* RESULTS */

Modified: trunk/blender/source/blender/bmesh/operators/bmo_similar.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_similar.c	2012-11-01 06:38:25 UTC (rev 51803)
+++ trunk/blender/source/blender/bmesh/operators/bmo_similar.c	2012-11-01 09:54:00 UTC (rev 51804)
@@ -20,7 +20,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/bmesh/operators/bmo_select_similar.c
+/** \file blender/bmesh/operators/bmo_similar.c
  *  \ingroup bmesh
  *
  * bmesh operators to select based on

Modified: trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c	2012-11-01 06:38:25 UTC (rev 51803)
+++ trunk/blender/source/blender/bmesh/operators/bmo_smooth_laplacian.c	2012-11-01 09:54:00 UTC (rev 51804)
@@ -204,7 +204,8 @@
 				sys->eweights[i] = w1;
 				sys->vlengths[idv1] += w1;
 				sys->vlengths[idv2] += w1;
-			}else{
+			}
+			else {
 				sys->zerola[idv1] = 1;
 				sys->zerola[idv2] = 1;
 			}
@@ -568,16 +569,16 @@
 	nlSolverParameteri(NL_NB_ROWS, bm->totvert);
 	nlSolverParameteri(NL_NB_RIGHT_HAND_SIDES, 3);
 
-	nlBegin(NL_SYSTEM);	
-	for (i=0; i < bm->totvert; i++) {
+	nlBegin(NL_SYSTEM);
+	for (i = 0; i < bm->totvert; i++) {
 		nlLockVariable(i);
 	}
 	BMO_ITER (v, &siter, bm, op, "verts", BM_VERT) {
 		m_vertex_id = BM_elem_index_get(v);
 		nlUnlockVariable(m_vertex_id);
-		nlSetVariable(0,m_vertex_id, v->co[0]);
-		nlSetVariable(1,m_vertex_id, v->co[1]);
-		nlSetVariable(2,m_vertex_id, v->co[2]);
+		nlSetVariable(0, m_vertex_id, v->co[0]);
+		nlSetVariable(1, m_vertex_id, v->co[1]);
+		nlSetVariable(2, m_vertex_id, v->co[2]);
 	}
 
 	nlBegin(NL_MATRIX);

Modified: trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.cpp	2012-11-01 06:38:25 UTC (rev 51803)
+++ trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.cpp	2012-11-01 09:54:00 UTC (rev 51804)
@@ -160,7 +160,7 @@
 	if (x >= this->m_rect.xmin && x < this->m_rect.xmax &&
 	    y >= this->m_rect.ymin && y < this->m_rect.ymax)
 	{
-		const int offset = (this->m_chunkWidth * (y-this->m_rect.ymin) + x-this->m_rect.xmin) * COM_NUMBER_OF_CHANNELS;
+		const int offset = (this->m_chunkWidth * (y - this->m_rect.ymin) + x - this->m_rect.xmin) * COM_NUMBER_OF_CHANNELS;
 		copy_v4_v4(&this->m_buffer[offset], color);
 	}
 }
@@ -170,7 +170,7 @@
 	if (x >= this->m_rect.xmin && x < this->m_rect.xmax &&
 	    y >= this->m_rect.ymin && y < this->m_rect.ymax)
 	{
-		const int offset = (this->m_chunkWidth * (y-this->m_rect.ymin) + x-this->m_rect.xmin) * COM_NUMBER_OF_CHANNELS;
+		const int offset = (this->m_chunkWidth * (y - this->m_rect.ymin) + x - this->m_rect.xmin) * COM_NUMBER_OF_CHANNELS;
 		add_v4_v4(&this->m_buffer[offset], color);
 	}
 }

Modified: trunk/blender/source/blender/compositor/intern/COM_NodeOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_NodeOperation.h	2012-11-01 06:38:25 UTC (rev 51803)
+++ trunk/blender/source/blender/compositor/intern/COM_NodeOperation.h	2012-11-01 09:54:00 UTC (rev 51804)
@@ -163,7 +163,10 @@
 	 * @param clMemToCleanUp all created cl_mem references must be added to this list. Framework will clean this after execution
 	 * @param clKernelsToCleanUp all created cl_kernel references must be added to this list. Framework will clean this after execution
 	 */
-	virtual void executeOpenCL(OpenCLDevice *device, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp) {}
+	virtual void executeOpenCL(OpenCLDevice *device,
+	                           MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer,
+	                           MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp,
+	                           list<cl_kernel> *clKernelsToCleanUp) {}
 	virtual void deinitExecution();
 
 	bool isResolutionSet() {

Modified: trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp	2012-11-01 06:38:25 UTC (rev 51803)
+++ trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp	2012-11-01 09:54:00 UTC (rev 51804)
@@ -106,13 +106,11 @@
 
 void COM_startReadHighlights()
 {
-	if (!g_highlightInitialized)
-	{
+	if (!g_highlightInitialized) {
 		return;
 	}
 	
-	if (g_highlightedNodesRead) 
-	{
+	if (g_highlightedNodesRead) {
 		MEM_freeN(g_highlightedNodesRead);
 	}
 	

Modified: trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp	2012-11-01 06:38:25 UTC (rev 51803)
+++ trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp	2012-11-01 09:54:00 UTC (rev 51804)
@@ -52,8 +52,7 @@
 	viewerOperation->setDisplaySettings(context->getDisplaySettings());
 
 	viewerOperation->setResolutionInputSocketIndex(0);
-	if (!imageSocket->isConnected())
-	{
+	if (!imageSocket->isConnected()) {
 		if (alphaSocket->isConnected()) {
 			viewerOperation->setResolutionInputSocketIndex(1);
 		}

Modified: trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.h	2012-11-01 06:38:25 UTC (rev 51803)
+++ trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.h	2012-11-01 09:54:00 UTC (rev 51804)
@@ -59,6 +59,9 @@
 
 	void setSize(float size) { this->m_size = size; this->m_sizeavailable = true; }
 	
-	void executeOpenCL(OpenCLDevice *device, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp);
+	void executeOpenCL(OpenCLDevice *device,
+	                   MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer,
+	                   MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp,
+	                   list<cl_kernel> *clKernelsToCleanUp);
 };
 #endif

Modified: trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp	2012-11-01 06:38:25 UTC (rev 51803)
+++ trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp	2012-11-01 09:54:00 UTC (rev 51804)
@@ -236,7 +236,7 @@
 	
 	/* horizontal */
 	m_radx = (float)this->m_data->sizex;
-	int imgx = getWidth()/2;
+	int imgx = getWidth() / 2;
 	if (m_radx > imgx)
 		m_radx = imgx;
 	else if (m_radx < 1)
@@ -245,7 +245,7 @@
 
 	/* vertical */
 	m_rady = (float)this->m_data->sizey;
-	int imgy = getHeight()/2;
+	int imgy = getHeight() / 2;
 	if (m_rady > imgy)
 		m_rady = imgy;
 	else if (m_rady < 1)
@@ -344,8 +344,8 @@
 		return true;
 	}

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list