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

Campbell Barton ideasman42 at gmail.com
Sat Dec 29 16:55:38 CET 2012


Revision: 53405
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53405
Author:   campbellbarton
Date:     2012-12-29 15:55:37 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_widgets.c
    trunk/blender/source/blender/makesrna/intern/rna_particle.c

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-12-29 15:25:03 UTC (rev 53404)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-12-29 15:55:37 UTC (rev 53405)
@@ -2319,7 +2319,7 @@
 
 		glEnableClientState(GL_VERTEX_ARRAY);
 		glVertexPointer(2, GL_FLOAT, 0, coord_array);
-		glDrawArrays(GL_LINE_STRIP, 0, LINK_RESOL+1);
+		glDrawArrays(GL_LINE_STRIP, 0, LINK_RESOL + 1);
 		glDisableClientState(GL_VERTEX_ARRAY);
 
 		glDisable(GL_BLEND);

Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_particle.c	2012-12-29 15:25:03 UTC (rev 53404)
+++ trunk/blender/source/blender/makesrna/intern/rna_particle.c	2012-12-29 15:55:37 UTC (rev 53405)
@@ -295,8 +295,8 @@
 	ParticleSettings *part = 0;
 	ParticleData *pars = 0;
 	ParticleCacheKey *cache = 0;
-	int totchild=0;
-	int path_nbr=0;
+	int totchild = 0;
+	int path_nbr = 0;
 	int totpart;
 	int max_k = 0;
 
@@ -309,7 +309,7 @@
 	if (part == NULL || pars == NULL || !psys_check_enabled(object, particlesystem))
 		return;
 	
-	if (part->ren_as==PART_DRAW_OB || part->ren_as==PART_DRAW_GR || part->ren_as==PART_DRAW_NOT)
+	if (part->ren_as == PART_DRAW_OB || part->ren_as == PART_DRAW_GR || part->ren_as == PART_DRAW_NOT)
 		return;
 
 	totchild = particlesystem->totchild * part->disp / 100;
@@ -324,9 +324,9 @@
 		return;
 
 	if (part->ren_as == PART_DRAW_PATH && particlesystem->pathcache)
-		path_nbr=(int)pow(2.0, part->draw_step);
+		path_nbr = (int)pow(2.0, part->draw_step);
 
-	if (particle_no<totpart) {
+	if (particle_no < totpart) {
 
 		if (path_nbr) {
 			cache = particlesystem->pathcache[particle_no];
@@ -337,7 +337,7 @@
 	else {
 
 		if (path_nbr) {
-			cache = particlesystem->childcache[particle_no-totpart];
+			cache = particlesystem->childcache[particle_no - totpart];
 
 			if (cache->steps < 0)
 				max_k = 0;
@@ -348,16 +348,16 @@
 
 	/*strands key loop data stored in cache + step->co*/
 	if (path_nbr) {
-		if (step>=0 && step<=path_nbr) {
-			if (step<=max_k)
-				copy_v3_v3(n_co, (cache+step)->co);
+		if (step >= 0 && step <= path_nbr) {
+			if (step <= max_k)
+				copy_v3_v3(n_co, (cache + step)->co);
 		}
 	}
 
 }
 
 static void rna_ParticleSystem_uv_on_emitter(ParticleSystem *particlesystem, ParticleSystemModifierData *modifier, ParticleData *particle, int particle_no,
-                                              float n_uv[2])
+                                             float n_uv[2])
 {
 	ParticleSettings *part = 0;
 	int totpart;
@@ -368,7 +368,7 @@
 	if (particlesystem == NULL)
 		return;
 
-	part=particlesystem->part;
+	part = particlesystem->part;
 
 		totchild = particlesystem->totchild;
 
@@ -383,7 +383,7 @@
 
 /* 3. start creating renderable things */
 	/* setup per particle individual stuff */
-	if (particle_no<totpart) {
+	if (particle_no < totpart) {
 
 		/* get uvco & mcol */
 		num = particle->num_dmcache;
@@ -407,7 +407,7 @@
 		}
 	}
 	else {
-		ChildParticle *cpa = particlesystem->child + particle_no-totpart;
+		ChildParticle *cpa = particlesystem->child + particle_no - totpart;
 
 		num = cpa->num;
 




More information about the Bf-blender-cvs mailing list