[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12859] trunk/blender/source/blender/ blenkernel:

[Brecht Van Lommel]

Revision: 12859
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12859
Author:   blendix
Date:     2007-12-12 22:49:48 +0100 (Wed, 12 Dec 2007)

Log Message:
-----------

Fix for bug #7872: setting particles disp to 100 has no effect.
Fix for bug #7878: particle panels do not update properly when
chaning particle types.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h
    trunk/blender/source/blender/blenkernel/intern/particle.c
    trunk/blender/source/blender/blenkernel/intern/particle_system.c

Modified: trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h	2007-12-12 18:01:45 UTC (rev 12858)
+++ trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h	2007-12-12 21:49:48 UTC (rev 12859)
@@ -91,8 +91,9 @@
 void mainqenter (unsigned short event, short val);
 void waitcursor(int);
 void allqueue(unsigned short event, short val);
-#define REDRAWVIEW3D	0x4010
-#define REDRAWBUTSEDIT	0x4019
+#define REDRAWVIEW3D		0x4010
+#define REDRAWBUTSOBJECT	0x4018
+#define REDRAWBUTSEDIT		0x4019
 struct Material;
 extern struct Material defmaterial;
 

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2007-12-12 18:01:45 UTC (rev 12858)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2007-12-12 21:49:48 UTC (rev 12859)
@@ -2290,7 +2290,7 @@
 	psys_particle_on_dm(ob, dm, from, pa->num, pa->num_dmcache, pa->fuv, pa->foffset, vec, 0, 0, 0, orco, 0);
 
 	/* see psys_face_mat for why this function is called */
-	transform_mesh_orco_verts(ob->data, orco, 1, 1);
+	transform_mesh_orco_verts(ob->data, &orco, 1, 1);
 	VECCOPY(hairmat[3],orco);
 }
 

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2007-12-12 18:01:45 UTC (rev 12858)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2007-12-12 21:49:48 UTC (rev 12859)
@@ -4377,6 +4377,10 @@
 
 		psys->recalc &= ~PSYS_TYPE;
 		alloc = 1;
+
+		/* this is a bad level call, but currently type change
+		 * can happen after redraw, so force redraw from here */
+		allqueue(REDRAWBUTSOBJECT, 0);
 	}
 	else
 		oldtotpart = psys->totpart;
@@ -4428,7 +4432,7 @@
 	/* set particles to be not calculated */
 	disp= (float)get_current_display_percentage(psys)/50.0f-1.0f;
 
-	if(disp<1.0f) for(p=0, pa=psys->particles; p<totpart; p++,pa++){
+	for(p=0, pa=psys->particles; p<totpart; p++,pa++){
 		if(pa->r_rot[0] > disp)
 			pa->flag |= PARS_NO_DISP;
 		else