diff options
| author | Anton Novoselov <[email protected]> | 2017-08-14 16:41:28 +0300 |
|---|---|---|
| committer | Anton Novoselov <[email protected]> | 2017-08-14 16:41:28 +0300 |
| commit | 9a1c1d814f3fa0b54b49d90b43130c02bc280f44 (patch) | |
| tree | eae6ead883173c66619c30b6a1ed085f3cb70f4d /tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.cpp | |
| parent | Updated to CL 22627414: (diff) | |
| download | blast-9a1c1d814f3fa0b54b49d90b43130c02bc280f44.tar.xz blast-9a1c1d814f3fa0b54b49d90b43130c02bc280f44.zip | |
Updated to CL 22661993:
* docs updates
* authoring fixes
* asset view in sample fix
* latest blast_tools_and_samples-windows.zip
Diffstat (limited to 'tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.cpp')
| -rw-r--r-- | tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.cpp | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.cpp b/tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.cpp index 3d48059..1eed17b 100644 --- a/tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.cpp +++ b/tools/ArtistTools/source/BlastPlugin/Window/BlastToolBar.cpp @@ -976,8 +976,16 @@ void BlastToolbar::on_btnDropObject_clicked() if (family) { physx::PxTransform t = family->getSettings().transform; - if(t.p.y < minHeight) - minHeight = t.p.y; + if (GlobalSettings::Inst().m_zup) + { + if (t.p.z < minHeight) + minHeight = t.p.z; + } + else + { + if (t.p.y < minHeight) + minHeight = t.p.y; + } } } } @@ -997,7 +1005,14 @@ void BlastToolbar::on_btnDropObject_clicked() if (family) { physx::PxTransform t = family->getSettings().transform; - t.p.y += fChange; + if (GlobalSettings::Inst().m_zup) + { + t.p.z += fChange; + } + else + { + t.p.y += fChange; + } family->initTransform(t); } } @@ -1016,7 +1031,14 @@ void BlastToolbar::on_btnDropObject_clicked() if (family) { physx::PxTransform t = family->getSettings().transform; - t.p.y -= fChange; + if (GlobalSettings::Inst().m_zup) + { + t.p.z -= fChange; + } + else + { + t.p.y -= fChange; + } family->initTransform(t); } } |