From 474fe33301e6a829fe14f45b9ac7d7e975cb4242 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 2 May 2011 05:24:59 +0000 Subject: fix transform code using a node space as an image space, accessing unallocated memory. also remove bullet patch which has now been applied. --- source/blender/editors/transform/transform_generics.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/transform') diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index cf169dd587e..8c7a39e5dff 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1018,12 +1018,18 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) } } } - else if(t->spacetype==SPACE_IMAGE || t->spacetype==SPACE_NODE) + else if(t->spacetype==SPACE_IMAGE) { SpaceImage *sima = sa->spacedata.first; - // XXX for now, get View2D from the active region + // XXX for now, get View2D from the active region t->view = &ar->v2d; - t->around = (sima ? sima->around : 0); + t->around = sima->around; + } + else if(t->spacetype==SPACE_NODE) + { + // XXX for now, get View2D from the active region + t->view = &ar->v2d; + t->around = V3D_CENTER; } else if(t->spacetype==SPACE_IPO) { -- cgit v1.2.3