[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12405] branches/particles/source/blender/ blenkernel/intern/anim.c: -group & object visualizations crashed because of a one silly wrong variable

[Janne Karhu]

Revision: 12405
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12405
Author:   jhk
Date:     2007-10-26 13:40:34 +0200 (Fri, 26 Oct 2007)

Log Message:
-----------
-group & object visualizations crashed because of a one silly wrong variable

Modified Paths:
--------------
    branches/particles/source/blender/blenkernel/intern/anim.c

Modified: branches/particles/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/particles/source/blender/blenkernel/intern/anim.c	2007-10-26 11:37:29 UTC (rev 12404)
+++ branches/particles/source/blender/blenkernel/intern/anim.c	2007-10-26 11:40:34 UTC (rev 12405)
@@ -706,7 +706,7 @@
 	ParticleKey state;
 	float ctime, pa_time;
 	float tmat[4][4], mat[3][3], obrotmat[3][3], parotmat[3][3], size=0.0;
-	float xvec[3]={-1.0,0.0,0.0}, *q;
+	float xvec[3] = {-1.0, 0.0, 0.0}, *q;
 						
 
 	int lay, a, k, step_nbr, counter;
@@ -718,7 +718,7 @@
 
 	if(part==0) return;
 
-	ctime= bsystem_time(par, (float)G.scene->r.cfra, 0.0);
+	ctime = bsystem_time(par, (float)G.scene->r.cfra, 0.0);
 
 	totpart = psys->totpart;
 	totchild = psys->totchild;
@@ -727,20 +727,20 @@
 		
 	lay= G.scene->lay;
 	if(part->draw_as == PART_DRAW_OB && part->dup_ob ||
-		part->draw_as == PART_DRAW_GR && part->dup_group && part->dup_group->gobject.first){
+		part->draw_as == PART_DRAW_GR && part->dup_group && part->dup_group->gobject.first) {
 
 		if(psys->flag & (PSYS_HAIR_DONE|PSYS_KEYED) && part->draw & PART_DRAW_KEYS)
-			step_nbr=part->keys_step;
+			step_nbr = part->keys_step;
 		else
-			step_nbr=1;
+			step_nbr = 1;
 
-		psys->lattice=psys_get_lattice(ob,psys);
+		psys->lattice = psys_get_lattice(par, psys);
 
-		if(part->draw_as==PART_DRAW_GR){
+		if(part->draw_as==PART_DRAW_GR) {
 			group_handle_recalc_and_update(par, part->dup_group);
 
 			go= part->dup_group->gobject.first;
-			while(go){
+			while(go) {
 				go=go->next;
 				totgroup++;
 			}
@@ -756,8 +756,8 @@
 		else
 			a=totpart;
 
-		for(pa=psys->particles,counter=0; a<totpart+totchild; a++,pa++,counter++){
-			if(a<totpart){
+		for(pa=psys->particles,counter=0; a<totpart+totchild; a++,pa++,counter++) {
+			if(a<totpart) {
 				if(pa->flag & (PARS_UNEXIST+PARS_NO_DISP)) continue;
 
 				pa_num=pa->num;
@@ -766,43 +766,43 @@
 
 				size=pa->size;
 			}
-			else{
+			else {
 				/* TODO: figure these two out */
-				pa_num=a;
-				pa_time=psys->particles[psys->child[a-totpart].parent].time;
+				pa_num = a;
+				pa_time = psys->particles[psys->child[a - totpart].parent].time;
 
-				size=psys_get_child_size(psys,a-totpart,ctime,0);
+				size=psys_get_child_size(psys, a - totpart, ctime, 0);
 			}
 
-			if(part->draw_as==PART_DRAW_GR){
+			if(part->draw_as==PART_DRAW_GR) {
 				if(part->draw&PART_DRAW_RAND_GR)
-					ob=oblist[BLI_rand()%totgroup];
+					ob = oblist[BLI_rand() % totgroup];
 				else if(part->from==PART_FROM_PARTICLE)
-					ob=oblist[pa_num%totgroup];
+					ob = oblist[pa_num % totgroup];
 				else
-					ob=oblist[a%totgroup];
+					ob = oblist[a % totgroup];
 			}
 			else
-				ob=part->dup_ob;
+				ob = part->dup_ob;
 
-			if(psys->flag & (PSYS_HAIR_DONE|PSYS_KEYED) && part->draw & PART_DRAW_KEYS){
-				for(k=0; k<=step_nbr; k++,counter++){
-					state.time=(float)k/(float)step_nbr;
-					psys_get_particle_on_path(par,psys,a,&state,0);
+			if(psys->flag & (PSYS_HAIR_DONE|PSYS_KEYED) && part->draw & PART_DRAW_KEYS) {
+				for(k=0; k<=step_nbr; k++, counter++) {
+					state.time = (float)k / (float)step_nbr;
+					psys_get_particle_on_path(par, psys, a, &state, 0);
 
 					copyob= *ob;
 
 					/* to give ipos in object correct offset */
-					where_is_object_time(ob, ctime-pa_time);
+					where_is_object_time(ob, ctime - pa_time);
 
-					QuatToMat3(state.rot,parotmat);
+					QuatToMat3(state.rot, parotmat);
 					
 					q= vectoquat(xvec, ob->trackflag, ob->upflag);
-					QuatToMat3(q,obrotmat);
+					QuatToMat3(q, obrotmat);
 
 					Mat3MulMat3(mat, parotmat, obrotmat);
 					Mat4CpyMat4(tmat, ob->obmat);
-					Mat4MulMat43(ob->obmat,tmat,mat);
+					Mat4MulMat43(ob->obmat, tmat, mat);
 					Mat4MulFloat3((float *)ob->obmat, size);
 
 					VECCOPY(ob->obmat[3], state.co);
@@ -814,23 +814,23 @@
 					*ob= copyob;
 				}
 			}
-			else{
-				state.time=-1.0;
-				if(psys_get_particle_state(par,psys,a,&state,0)){
+			else {
+				state.time = -1.0;
+				if(psys_get_particle_state(par, psys, a, &state, 0)) {
 
-					copyob= *ob;
+					copyob = *ob;
 
 					/* to give ipos in object correct offset */
 					where_is_object_time(ob, ctime-pa_time);
 
-					QuatToMat3(state.rot,parotmat);
+					QuatToMat3(state.rot, parotmat);
 					
-					q= vectoquat(xvec, ob->trackflag, ob->upflag);
-					QuatToMat3(q,obrotmat);
+					q = vectoquat(xvec, ob->trackflag, ob->upflag);
+					QuatToMat3(q, obrotmat);
 
 					Mat3MulMat3(mat, parotmat, obrotmat);
 					Mat4CpyMat4(tmat, ob->obmat);
-					Mat4MulMat43(ob->obmat,tmat,mat);
+					Mat4MulMat43(ob->obmat, tmat, mat);
 					Mat4MulFloat3((float *)ob->obmat, size);
 
 					VECCOPY(ob->obmat[3], state.co);
@@ -839,7 +839,7 @@
 					Mat4CpyMat4(ob->obmat, copyob.obmat);
 					new_dupli_object(lb, ob, tmat, par->lay, counter);
 
-					*ob= copyob;
+					*ob = copyob;
 				}
 			}
 		}
@@ -847,9 +847,9 @@
 	if(oblist)
 		MEM_freeN(oblist);
 
-	if(psys->lattice){
+	if(psys->lattice) {
 		end_latt_deform();
-		psys->lattice=0;
+		psys->lattice = 0;
 	}
 }