diff options
| -rw-r--r-- | source/blender/src/space.c | 4 | ||||
| -rwxr-xr-x | source/blender/src/transform.c | 4 | ||||
| -rwxr-xr-x | source/blender/src/transform_constraints.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 3c831743206..668e6d13715 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -2770,9 +2770,9 @@ void drawinfospace(ScrArea *sa, void *spacedata) (xpos+edgsp+(4*midsp)+(4*mpref)),y3label,mpref,buth, 0, 0, 0, 0, 0, ""); - uiDefButBitI(block, TOG, USER_DISABLE_SOUND, B_SOUNDTOGGLE, "Disable Sound", + uiDefButBitI(block, TOG, USER_DISABLE_SOUND, B_SOUNDTOGGLE, "Disable Game Sound", (xpos+edgsp+(4*mpref)+(4*midsp)),y2,mpref,buth, - &(U.gameflags), 0, 0, 0, 0, "Disables sounds from being played"); + &(U.gameflags), 0, 0, 0, 0, "Disables sounds from being played in games"); uiDefButBitS(block, TOG, USER_FILTERFILEEXTS, 0, "Filter File Extensions", (xpos+edgsp+(4*mpref)+(4*midsp)),y1,mpref,buth, diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c index c7297b64819..4e86877f0c1 100755 --- a/source/blender/src/transform.c +++ b/source/blender/src/transform.c @@ -1907,9 +1907,9 @@ int Crease(TransInfo *t, short mval[2]) outputNumInput(&(t->num), c); if (crease >= 0.0f) - sprintf(str, "Crease: +%s", c, t->proptext); + sprintf(str, "Crease: +%s %s", c, t->proptext); else - sprintf(str, "Crease: %s", c, t->proptext); + sprintf(str, "Crease: %s %s", c, t->proptext); } else { /* default header print */ diff --git a/source/blender/src/transform_constraints.c b/source/blender/src/transform_constraints.c index 102b3a6c19a..766b8382898 100755 --- a/source/blender/src/transform_constraints.c +++ b/source/blender/src/transform_constraints.c @@ -418,7 +418,7 @@ static void applyAxisConstraintRot(TransInfo *t, TransData *td, float vec[3]) break; } if (!(mode & CON_NOFLIP)) { - if (Inpf(vec, G.vd->viewinv[2]) > 0.0f) { + if (Inpf(vec, t->viewinv[2]) > 0.0f) { VecMulf(vec, -1.0f); } } @@ -459,7 +459,7 @@ static void applyObjectConstraintRot(TransInfo *t, TransData *td, float vec[3]) break; } if (!(mode & CON_NOFLIP)) { - if (Inpf(vec, G.vd->viewinv[2]) > 0.0f) { + if (Inpf(vec, t->viewinv[2]) > 0.0f) { VecMulf(vec, -1.0f); } } |