[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12691] trunk/blender/source/blender/src:

[Brecht Van Lommel]

Revision: 12691
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12691
Author:   blendix
Date:     2007-11-27 14:20:51 +0100 (Tue, 27 Nov 2007)

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

Particles
=========

- Fix for bug #7837: circle drawtype + velocity crashed.
- Setting density vertex group didn't do proper refresh.

Mesh Deform Modifier
====================

- Make it work for nurbs and curves.

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_editing.c
    trunk/blender/source/blender/src/buttons_object.c
    trunk/blender/source/blender/src/drawobject.c

Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c	2007-11-27 13:08:20 UTC (rev 12690)
+++ trunk/blender/source/blender/src/buttons_editing.c	2007-11-27 13:20:51 UTC (rev 12691)
@@ -1596,6 +1596,12 @@
 		else if(ob->type == OB_LATTICE) {
 			lattice_calc_modifiers(ob);
 		}
+		else if(ob->type==OB_MBALL) {
+			makeDispListMBall(ob);
+		}
+		else if(ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
+			makeDispListCurveTypes(ob, 0);
+		}
 
 		mmd->needbind= 0;
 		mmd->modifier.mode= mode;

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2007-11-27 13:08:20 UTC (rev 12690)
+++ trunk/blender/source/blender/src/buttons_object.c	2007-11-27 13:20:51 UTC (rev 12691)
@@ -3766,7 +3766,7 @@
 		
 		butx+=butw;
 
-		uiDefButS(block, MENU, B_PART_REDRAW, menustr,	butx,buty,buth,buth, psys->vgroup+vgnum, 0, defCount, 0, 0, "Browses available vertex groups");
+		but= uiDefButS(block, MENU, B_PART_REDRAW, menustr,	butx,buty,buth,buth, psys->vgroup+vgnum, 0, defCount, 0, 0, "Browses available vertex groups");
 		uiButSetFunc(but, particle_set_vg, (void *)ob, (void *)(&vgnum));
 		MEM_freeN (menustr);
 

Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c	2007-11-27 13:08:20 UTC (rev 12690)
+++ trunk/blender/source/blender/src/drawobject.c	2007-11-27 13:20:51 UTC (rev 12691)
@@ -3407,10 +3407,9 @@
 /* 6. */
 
 		glGetIntegerv(GL_POLYGON_MODE, polygonmode);
+		glDisableClientState(GL_NORMAL_ARRAY);
 
 		if(draw_as != PART_DRAW_CIRC){
-			glDisableClientState(GL_NORMAL_ARRAY);
-
 			if(draw_as==PART_DRAW_PATH){
 				ParticleCacheKey **cache, *path;
 				float *cd2=0,*cdata2=0;