blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 756 Projects 19 Wiki Activity

Missing from last commit (missed manually resolving)

This commit is contained in:
Campbell Barton 2017-08-28 16:28:50 +10:00
parent 8cd2b6ca8e
commit 7114b5681f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/transform/transform_generics.c
View File

@ -1866,7 +1866,9 @@ static void calculateCenter_FromAround(TransInfo *t, int around, float r_center[
void calculateCenter(TransInfo *t)
{
calculateCenter_FromAround(t, t->around, t->center);
if ((t->flag & T_OVERRIDE_CENTER) == 0) {
calculateCenter_FromAround(t, t->around, t->center);
}
calculateCenterGlobal(t, t->center, t->center_global);
/* avoid calculating again */
@ -1880,7 +1882,7 @@ void calculateCenter(TransInfo *t)
calculateCenter2D(t);
/* for panning from cameraview */
if (t->flag & T_OBJECT) {
if ((t->flag & T_OBJECT) && (t->flag & T_OVERRIDE_CENTER) == 0) {
if (t->spacetype == SPACE_VIEW3D && t->ar && t->ar->regiontype == RGN_TYPE_WINDOW) {
if (t->flag & T_CAMERA) {