[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12741] trunk/blender:

[Brecht Van Lommel]

Revision: 12741
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12741
Author:   blendix
Date:     2007-12-01 13:08:46 +0100 (Sat, 01 Dec 2007)

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

Fix for bug #7851: crash with LSCM unwrap, due to opennl refactor.
Fix for bug #7856: crash hitting "neg" button for particle vertex groups.

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

Modified: trunk/blender/intern/opennl/intern/opennl.c
===================================================================
--- trunk/blender/intern/opennl/intern/opennl.c	2007-12-01 11:59:53 UTC (rev 12740)
+++ trunk/blender/intern/opennl/intern/opennl.c	2007-12-01 12:08:46 UTC (rev 12741)
@@ -240,7 +240,7 @@
 	M->storage = storage;
 	if(storage & __NL_ROWS) {
 		M->row = __NL_NEW_ARRAY(__NLRowColumn, m);
-		for(i=0; i<n; i++) {
+		for(i=0; i<m; i++) {
 			__nlRowColumnConstruct(&(M->row[i]));
 		}
 	} else {

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2007-12-01 11:59:53 UTC (rev 12740)
+++ trunk/blender/source/blender/src/buttons_object.c	2007-12-01 12:08:46 UTC (rev 12741)
@@ -3772,7 +3772,7 @@
 		
 		uiDefButS(block, MENU, B_PART_REDRAW, "Attribute%t|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");
-		uiButSetFunc(but, particle_set_vg, (void *)psys, (void *)(&vgnum));
+		uiButSetFunc(but, particle_set_vg, (void *)ob, (void *)(&vgnum));
 		
 		butx+=butw;