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>2013-11-25 01:37:57 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-11-25 02:40:52 +0400
commitd305df2226ccdf371d127d1c4f39690042f483bd (patch)
tree320b2bd0c33b100f9df44854374101704243e624 /source/blender/editors/transform/transform_manipulator.c
parent710f3746fcb4c599b7f833e5df66371566caa56b (diff)
Transform: old todo, removing an orientation now checks all screens.
also fix for using uninitialized matrix when an out-of-range index is set for custom orientations.
Diffstat (limited to 'source/blender/editors/transform/transform_manipulator.c')
-rw-r--r--source/blender/editors/transform/transform_manipulator.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 132a46441e6..5ac97ed4e26 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -642,8 +642,9 @@ int calc_manipulator_stats(const bContext *C)
default: /* V3D_MANIP_CUSTOM */
{
float mat[3][3];
- applyTransformOrientation(C, mat, NULL);
- copy_m4_m3(rv3d->twmat, mat);
+ if (applyTransformOrientation(C, mat, NULL)) {
+ copy_m4_m3(rv3d->twmat, mat);
+ }
break;
}
}