Fix for bug #7851: crash with LSCM unwrap, due to opennl refactor.

Fix for bug #7856: crash hitting "neg" button for particle vertex groups.

diff --git a/intern/opennl/intern/opennl.c b/intern/opennl/intern/opennl.c
index 2d30da075d33979db1b62cf3e84809ac3e350dec..d779e861cb6947d7483704975b07c6132c0f0b0e 100644 (file)
--- a/intern/opennl/intern/opennl.c
+++ b/intern/opennl/intern/opennl.c
@@ -240,7 +240,7 @@ static void __nlSparseMatrixConstruct(
        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 {

diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 45f1cbe3e9f1223356e907e915cb73fd1fa5865f..0f0845cecd1b6a419181525c3f7628e999d18c3b 100644 (file)
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -3772,7 +3772,7 @@ static void object_panel_particle_extra(Object *ob)
                
                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;