[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16445] trunk/blender/source/blender/src:

[Brecht Van Lommel]

Revision: 16445
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16445
Author:   blendix
Date:     2008-09-09 22:09:54 +0200 (Tue, 09 Sep 2008)

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

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

Modified Paths:
--------------
    trunk/blender/source/blender/src/editobject.c
    trunk/blender/source/blender/src/meshlaplacian.c

Modified: trunk/blender/source/blender/src/editobject.c
===================================================================
--- trunk/blender/source/blender/src/editobject.c       2008-09-09 20:01:21 UTC 
(rev 16444)
+++ trunk/blender/source/blender/src/editobject.c       2008-09-09 20:09:54 UTC 
(rev 16445)
@@ -4138,6 +4138,7 @@
        } 
        else {
                ob= OBACT;
+               if(ob==0) return;
                
                if ((ob->pose) && (ob->flag & OB_POSEMODE))
                        evt = pupmenu("Apply Object%t|Current Pose as 
RestPose%x3");

Modified: trunk/blender/source/blender/src/meshlaplacian.c
===================================================================
--- trunk/blender/source/blender/src/meshlaplacian.c    2008-09-09 20:01:21 UTC 
(rev 16444)
+++ trunk/blender/source/blender/src/meshlaplacian.c    2008-09-09 20:09:54 UTC 
(rev 16445)
@@ -178,7 +178,6 @@
                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 @@
                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 @@
        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;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs