diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-04 19:13:37 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-04 19:13:37 +0400 |
| commit | 25976b7b87a6e4a2fdf0d78db9a996c0c7621b8a (patch) | |
| tree | 44bc5ca049c056b0e328659c8e0cbd175aaf0c45 /source/blender | |
| parent | 8d1a04a2bb0b5ff894fd7ed5ee72c56e01df36fd (diff) | |
crash fix: screen context editable_bones & visible_bones were not checking for armature type object first.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_lib.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_context.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c index b2ff8306526..7edbac3ebd2 100644 --- a/source/blender/editors/mesh/editmesh_lib.c +++ b/source/blender/editors/mesh/editmesh_lib.c @@ -2006,8 +2006,8 @@ void recalc_editnormals(EditMesh *em) 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); diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 2def3561cf0..f73ede19724 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -154,7 +154,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult 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 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult } } 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"); |