[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36001] trunk/blender/source/blender/ editors: crash fix: screen context editable_bones & visible_bones were not checking for armature type object first .

[Campbell Barton]

Revision: 36001
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36001
Author:   campbellbarton
Date:     2011-04-04 15:13:37 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
crash fix: screen context editable_bones & visible_bones were not checking for 
armature type object first.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_lib.c
    trunk/blender/source/blender/editors/screen/screen_context.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_lib.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_lib.c    2011-04-04 
15:01:22 UTC (rev 36000)
+++ trunk/blender/source/blender/editors/mesh/editmesh_lib.c    2011-04-04 
15:13:37 UTC (rev 36001)
@@ -2006,8 +2006,8 @@
                zero_v3(eve->no);
 
        for(efa= em->faces.first; efa; efa=efa->next) {
-               float *n4= (efa->v4)? efa->v4->no: NULL;
-               float *c4= (efa->v4)? efa->v4->co: NULL;
+               // float *n4= (efa->v4)? efa->v4->no: NULL;
+               // float *c4= (efa->v4)? efa->v4->co: NULL;
 
                if(efa->v4) {
                        normal_quad_v3(efa->n, efa->v1->co, efa->v2->co, 
efa->v3->co, efa->v4->co);

Modified: trunk/blender/source/blender/editors/screen/screen_context.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_context.c        
2011-04-04 15:01:22 UTC (rev 36000)
+++ trunk/blender/source/blender/editors/screen/screen_context.c        
2011-04-04 15:13:37 UTC (rev 36001)
@@ -154,7 +154,7 @@
                return 1;
        }
        else if(CTX_data_equals(member, "visible_bones") || 
CTX_data_equals(member, "editable_bones")) {
-               bArmature *arm= (obedit) ? obedit->data : NULL;
+               bArmature *arm= (obedit && obedit->type == OB_ARMATURE) ? 
obedit->data : NULL;
                EditBone *ebone, *flipbone=NULL;
                int editable_bones= CTX_data_equals(member, "editable_bones");
                
@@ -196,7 +196,7 @@
                }
        }
        else if(CTX_data_equals(member, "selected_bones") || 
CTX_data_equals(member, "selected_editable_bones")) {
-               bArmature *arm= (obedit) ? obedit->data : NULL;
+               bArmature *arm= (obedit && obedit->type == OB_ARMATURE) ? 
obedit->data : NULL;
                EditBone *ebone, *flipbone=NULL;
                int selected_editable_bones= CTX_data_equals(member, 
"selected_editable_bones");
                

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