[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13642] trunk/blender/source/blender/src: Fix for bug #7857.

[Janne Karhu]

Revision: 13642
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13642
Author:   jhk
Date:     2008-02-11 15:38:30 +0100 (Mon, 11 Feb 2008)

Log Message:
-----------
Fix for bug #7857.

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

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2008-02-11 13:30:52 UTC (rev 13641)
+++ trunk/blender/source/blender/src/buttons_object.c	2008-02-11 14:38:30 UTC (rev 13642)
@@ -4156,12 +4156,12 @@
 		uiBlockBeginAlign(block);
 		
 		uiDefButS(block, MENU, B_PART_REDRAW, "Attribute%t|Effector%x11|TanRot%x10|TanVel%x9|Size%x8|RoughE%x7|Rough2%x6|Rough1%x5|Kink%x4|Clump%x3|Length%x2|Velocity%x1|Density%x0", butx,(buty-=buth),butw-40,buth, &vgnum, 14.0, 0.0, 0, 0, "Attribute effected by vertex group");
-		but=uiDefButBitS(block, TOG, (1<<vgnum), B_PART_REDRAW, "Neg",	butx+butw-40,buty,40,buth, &psys->vg_neg, 0, 0, 0, 0, "Negate the effect of the vertex group");
+		but=uiDefButBitS(block, TOG, (1<<vgnum), B_PART_RECALC, "Neg",	butx+butw-40,buty,40,buth, &psys->vg_neg, 0, 0, 0, 0, "Negate the effect of the vertex group");
 		uiButSetFunc(but, particle_set_vg, (void *)ob, (void *)(&vgnum));
 		
 		butx+=butw;
 
-		but= 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_RECALC, 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);
 
@@ -4172,7 +4172,7 @@
 			else{
 				uiDefBut(block, BUT, B_PART_REDRAW, "(no group)",	butx+buth,buty,butw-2*buth,buth, NULL, 0.0, 0.0, 0, 0, "Vertex Group doesn't exist anymore");
 			}
-			but=uiDefIconBut(block, BUT, B_PART_REDRAW, ICON_X, butx+butw-buth,buty,buth,buth, 0, 0, 0, 0, 0, "Disable use of vertex group");
+			but=uiDefIconBut(block, BUT, B_PART_RECALC, ICON_X, butx+butw-buth,buty,buth,buth, 0, 0, 0, 0, 0, "Disable use of vertex group");
 			uiButSetFunc(but, particle_del_vg, (void *)ob, (void *)(&vgnum));
 		}
 

Modified: trunk/blender/source/blender/src/vpaint.c
===================================================================
--- trunk/blender/source/blender/src/vpaint.c	2008-02-11 13:30:52 UTC (rev 13641)
+++ trunk/blender/source/blender/src/vpaint.c	2008-02-11 14:38:30 UTC (rev 13642)
@@ -57,6 +57,7 @@
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 #include "DNA_object_force.h"
+#include "DNA_particle_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 #include "DNA_scene_types.h"
@@ -1355,6 +1356,24 @@
 		if(clmd)
 			clmd->sim_parms->flags |= CLOTH_SIMSETTINGS_FLAG_RESET;
 	}	
+
+	/* and particles too */
+	if(ob->particlesystem.first) {
+		ParticleSystem *psys;
+		int i;
+
+		psys= ob->particlesystem.first;
+		while(psys) {
+			for(i=0; i<PSYS_TOT_VG; i++) {
+				if(psys->vgroup[i]==ob->actdef) {
+					psys->recalc |= PSYS_RECALC_HAIR;
+					break;
+				}
+			}
+
+			psys= psys->next;
+		}
+	}
 	
 	BIF_undo_push("Weight Paint");
 	allqueue(REDRAWVIEW3D, 0);