diff options
author | Ton Roosendaal <ton@blender.org> | 2011-03-28 16:16:20 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2011-03-28 16:16:20 +0400 |
commit | 713f976918d2ed00fb088430d2e417d7d055b693 (patch) | |
tree | 3b9688ed60f95a1c398599538668690c08e3605c /source/blender/editors/space_view3d | |
parent | ca383667327683e99cb9ca36f6cac3b82e25d674 (diff) |
Bugfix, irc report:
Entering editmode crashed, missing v3d properties storage, which got
accidentally removed.
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index b404a7be27c..cd6f8954430 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -137,7 +137,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float { uiBlock *block= (layout)? uiLayoutAbsoluteBlock(layout): NULL; MDeformVert *dvert=NULL; - TransformProperties *tfp= v3d->properties_storage; + TransformProperties *tfp; float median[6], ve_median[6]; int tot, totw, totweight, totedge, totradius; char defstr[320]; @@ -146,6 +146,11 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float tot= totw= totweight= totedge= totradius= 0; defstr[0]= 0; + /* make sure we got storage */ + if(v3d->properties_storage==NULL) + v3d->properties_storage= MEM_callocN(sizeof(TransformProperties), "TransformProperties"); + tfp= v3d->properties_storage; + if(ob->type==OB_MESH) { Mesh *me= ob->data; EditMesh *em = BKE_mesh_get_editmesh(me); |