diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-01 15:08:46 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-01 15:08:46 +0300 |
commit | 4813af326ba15a5aac8f94e1f0a6a34eabc40b4e (patch) | |
tree | dfb003a1a04d759b46ee8f9d816441ae7d4d471f | |
parent | 092e9dcdc342aa173e24a5ab286b1faee4fe8a53 (diff) |
Fix for bug #7851: crash with LSCM unwrap, due to opennl refactor.
Fix for bug #7856: crash hitting "neg" button for particle vertex groups.
-rw-r--r-- | intern/opennl/intern/opennl.c | 2 | ||||
-rw-r--r-- | source/blender/src/buttons_object.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/opennl/intern/opennl.c b/intern/opennl/intern/opennl.c index 2d30da075d3..d779e861cb6 100644 --- 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 45f1cbe3e9f..0f0845cecd1 100644 --- 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; |