archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for bug #17588: crash with ctrl+a and no active object.

Browse Source
This commit is contained in:
Brecht Van Lommel
2008-09-09 20:09:54 +00:00
parent 84d7e2ea9c
commit df1d59805f
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/src/editobject.c
View File

@@ -4138,6 +4138,7 @@ void apply_object( void )
}
else {
ob= OBACT;
if(ob==0) return;
if ((ob->pose) && (ob->flag & OB_POSEMODE))
evt = pupmenu("Apply Object%t|Current Pose as RestPose%x3");

6
source/blender/src/meshlaplacian.c
View File

@@ -178,7 +178,6 @@ static void laplacian_triangle_area(LaplacianSystem *sys, int i1, int i2, int i3
varea[i1] += (obtuse == 1)? area: area*0.5;
varea[i2] += (obtuse == 2)? area: area*0.5;
varea[i3] += (obtuse == 3)? area: area*0.5;
//printf("area %f\n", area);
}
else {
len1= VecLenf(v2, v3);
@@ -192,10 +191,7 @@ static void laplacian_triangle_area(LaplacianSystem *sys, int i1, int i2, int i3
varea[i1] += (t2 + t3)*0.25f;
varea[i2] += (t1 + t3)*0.25f;
varea[i3] += (t1 + t2)*0.25f;
//printf("varea %f %f %f\n", t1, t2, t3);
}
//printf("triangle area %f %f %f\n", t1, t2, t3);
}
static void laplacian_triangle_weights(LaplacianSystem *sys, int f, int i1, int i2, int i3)
@@ -298,7 +294,7 @@ void laplacian_system_construct_end(LaplacianSystem *sys)
for(a=0; a<totvert; a++) {
if(sys->areaweights) {
if(sys->varea[a] != 0.0f)
sys->varea[a]= 0.5f/sys->varea[a]; //MAX2(sys->varea[a], 0.001f);
sys->varea[a]= 0.5f/sys->varea[a];
}
else
sys->varea[a]= 1.0f;