diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-20 15:10:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-20 15:12:08 +0300 |
| commit | 66377b89da08f46a27d48fd918fcee0daa505429 (patch) | |
| tree | 00122cca079a645f76c8b6c2655e43fdd4bd5d66 /source/blender/gpu/intern/gpu_matrix.c | |
| parent | afc885cd13a98fca347eee1af472099f6e9a9c03 (diff) | |
Fix T51251: Armature/Normal-button scaled twice
Diffstat (limited to 'source/blender/gpu/intern/gpu_matrix.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_matrix.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/gpu/intern/gpu_matrix.c b/source/blender/gpu/intern/gpu_matrix.c index 8bf17653850..c586e75c050 100644 --- a/source/blender/gpu/intern/gpu_matrix.c +++ b/source/blender/gpu/intern/gpu_matrix.c @@ -348,14 +348,17 @@ void gpuTranslate3fv(const float vec[3]) void gpuScaleUniform(float factor) { +#if SUPPORT_LEGACY_MATRIX + { + glScalef(factor, factor, factor); /* always scale Z since we can't distinguish 2D from 3D */ + state.dirty = true; + return; + } +#endif Mat4 m; scale_m4_fl(m, factor); + m[2][2] = 1.0; gpuMultMatrix(m); - -#if SUPPORT_LEGACY_MATRIX - glScalef(factor, factor, factor); /* always scale Z since we can't distinguish 2D from 3D */ - state.dirty = true; -#endif } void gpuScale2f(float x, float y) |