forked from bartvdbraak/blender
crash fix: screen context editable_bones & visible_bones were not checking for armature type object first.
This commit is contained in:
parent
8d1a04a2bb
commit
25976b7b87
@ -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);
|
||||
|
@ -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");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user