[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13769] trunk/blender/source/blender: error in last commit

[Campbell Barton]

Revision: 13769
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13769
Author:   campbellbarton
Date:     2008-02-19 19:44:40 +0100 (Tue, 19 Feb 2008)

Log Message:
-----------
error in last commit

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle_system.c
    trunk/blender/source/blender/src/toolbox.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-02-19 18:36:50 UTC (rev 13768)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-02-19 18:44:40 UTC (rev 13769)
@@ -2651,14 +2651,9 @@
 				if(falloff<=0.0f)
 					;	/* don't do anything */
 				else if(pd->forcefield==PFIELD_TEXTURE) {
-					if 
-						do_texture_effector(pd->tex, pd->tex_mode, pd->flag&PFIELD_TEX_2D, pd->tex_nabla,
-										pd->flag & PFIELD_TEX_OBJECT, (pd->flag & PFIELD_TEX_ROOTCO) ? rootco, eob->obmat,
-										pd->f_strength, falloff, force_field);
-					else
-						do_texture_effector(pd->tex, pd->tex_mode, pd->flag&PFIELD_TEX_2D, pd->tex_nabla,
-										pd->flag & PFIELD_TEX_OBJECT, state->co, eob->obmat,
-										pd->f_strength, falloff, force_field);
+					do_texture_effector(pd->tex, pd->tex_mode, pd->flag&PFIELD_TEX_2D, pd->tex_nabla,
+									pd->flag & PFIELD_TEX_OBJECT, (pd->flag & PFIELD_TEX_ROOTCO) ? rootco : state->co, eob->obmat,
+									pd->f_strength, falloff, force_field);
 				} else {
 					do_physical_effector(pd->forcefield,pd->f_strength,distance,
 										falloff,pd->f_dist,pd->f_damp,eob->obmat[2],vec_to_part,

Modified: trunk/blender/source/blender/src/toolbox.c
===================================================================
--- trunk/blender/source/blender/src/toolbox.c	2008-02-19 18:36:50 UTC (rev 13768)
+++ trunk/blender/source/blender/src/toolbox.c	2008-02-19 18:44:40 UTC (rev 13769)
@@ -2268,7 +2268,7 @@
 	uiBut *but;
 	TBitem *menu;
 	int dx=96;
-	short event, mval[2], tot=0;
+	short event, mval[2];
 	long ypos = -5;
 	
 	tb_mainx= -32;