Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-05-02 09:24:59 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-05-02 09:24:59 +0400
commit474fe33301e6a829fe14f45b9ac7d7e975cb4242 (patch)
tree00c97f3a98ff6ec78e9634739091bac6e1b5a64b /source/blender/editors/transform
parent07ee0dcc74042779511528975c2ae7956abf7478 (diff)
fix transform code using a node space as an image space, accessing unallocated memory.
also remove bullet patch which has now been applied.
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r--source/blender/editors/transform/transform_generics.c12
1 files changed, 9 insertions, 3 deletions
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)
{