Commit: 7114b5681f5c6827149f34420eb5dc2ca2a1c656
Author: Campbell Barton
Date: Mon Aug 28 16:28:50 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB7114b5681f5c6827149f34420eb5dc2ca2a1c656
Missing from last commit (missed manually resolving)
===================================================================
M source/blender/editors/transform/transform_generics.c
===================================================================
diff --git a/source/blender/editors/transform/transform_generics.c
b/source/blender/editors/transform/transform_generics.c
index c8f7c6f3010..5fd34cde3d6 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -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) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
