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-10-02 16:21:24 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-10-02 16:21:24 +0400
commita1d647e92cd7f51659f0bcb16fb05c1b30177b79 (patch)
tree0dc737dc1507aec54ce930abdc878071151ce779 /source/blender/editors/transform
parent90b38eaa0c05754ef8bab20b6bdc906dd506fa6c (diff)
remove some redundant checks and compiler warnings.
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r--source/blender/editors/transform/transform.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index c77f7620326..8699bc88645 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2611,8 +2611,8 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3]) {
copy_v3_v3(center, td->center);
}
else if (t->flag & T_EDIT) {
-
- if(t->around==V3D_LOCAL && (t->settings->selectmode & SCE_SELECT_FACE)) {
+
+ if(t->settings->selectmode & SCE_SELECT_FACE) {
copy_v3_v3(center, td->center);
}
else {
@@ -2899,19 +2899,17 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
float vec[3], totmat[3][3], smat[3][3];
float eul[3], fmat[3][3], quat[4];
float *center = t->center;
-
+
/* local constraint shouldn't alter center */
if (around == V3D_LOCAL) {
if (t->flag & (T_OBJECT|T_POSE)) {
center = td->center;
}
- else {
- if(around==V3D_LOCAL && (t->settings->selectmode & SCE_SELECT_FACE)) {
- center = td->center;
- }
+ else if (t->settings->selectmode & SCE_SELECT_FACE) {
+ center = td->center;
}
}
-
+
if (t->flag & T_POINTS) {
mul_m3_m3m3(totmat, mat, td->mtx);
mul_m3_m3m3(smat, td->smtx, totmat);