diff options
| -rw-r--r-- | extern/bullet2/uninitialized_stack_vec.patch | 17 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 12 |
2 files changed, 9 insertions, 20 deletions
diff --git a/extern/bullet2/uninitialized_stack_vec.patch b/extern/bullet2/uninitialized_stack_vec.patch deleted file mode 100644 index 96833b717b7..00000000000 --- a/extern/bullet2/uninitialized_stack_vec.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp -=================================================================== ---- src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp (revision 34336) -+++ src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp (working copy) -@@ -61,10 +61,12 @@ - scaledAabbMin[0] = m_localScaling.getX() >= 0. ? aabbMin[0] * invLocalScaling[0] : aabbMax[0] * invLocalScaling[0]; - scaledAabbMin[1] = m_localScaling.getY() >= 0. ? aabbMin[1] * invLocalScaling[1] : aabbMax[1] * invLocalScaling[1]; - scaledAabbMin[2] = m_localScaling.getZ() >= 0. ? aabbMin[2] * invLocalScaling[2] : aabbMax[2] * invLocalScaling[2]; -+ scaledAabbMin[3] = 0.0; /* otherwise un-initialized stack memory: uninitialized_stack_vec.patch, blender patch */ - - scaledAabbMax[0] = m_localScaling.getX() <= 0. ? aabbMin[0] * invLocalScaling[0] : aabbMax[0] * invLocalScaling[0]; - scaledAabbMax[1] = m_localScaling.getY() <= 0. ? aabbMin[1] * invLocalScaling[1] : aabbMax[1] * invLocalScaling[1]; - scaledAabbMax[2] = m_localScaling.getZ() <= 0. ? aabbMin[2] * invLocalScaling[2] : aabbMax[2] * invLocalScaling[2]; -+ scaledAabbMax[3] = 0.0; /* otherwise un-initialized stack memory: uninitialized_stack_vec.patch, blender patch */ - - - m_bvhTriMeshShape->processAllTriangles(&scaledCallback,scaledAabbMin,scaledAabbMax); 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) { |