diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 21:55:28 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-02-28 21:55:28 +0200 |
| commit | 201f83472c604e837b40c12f3750602e30d79d0b (patch) | |
| tree | b5e983c44eb9913c5778f0773ac986d6bf038e20 /indra/newview/llmaniprotate.cpp | |
| parent | 696795a368a8825fb083627e39f65dcc30266122 (diff) | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
Merge branch 'master' into DRTVWR-543-maint
Diffstat (limited to 'indra/newview/llmaniprotate.cpp')
| -rw-r--r-- | indra/newview/llmaniprotate.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp index 7c942e8b53..3566ca7a35 100644 --- a/indra/newview/llmaniprotate.cpp +++ b/indra/newview/llmaniprotate.cpp @@ -1556,7 +1556,10 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y ) LLVector3 object_axis; getObjectAxisClosestToMouse(object_axis); - object_axis = object_axis * first_object_node->mSavedRotation; + if (first_object_node) + { + object_axis = object_axis * first_object_node->mSavedRotation; + } // project onto constraint plane object_axis = object_axis - (object_axis * getConstraintAxis()) * getConstraintAxis(); |