Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:41:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4667 from samcake/orange

Browse source 
Fix for transform issues for overlay 3d elements on mac and linux
This commit is contained in:
Brad Hefta-Gaub 2015-04-20 16:15:34 -07:00
commit 098a18b725
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/render-utils/src/Model.cpp
View file

@ -1754,6 +1754,12 @@ void Model::setupBatchTransform(gpu::Batch& batch, RenderArgs* args) {
void Model::endScene(RenderMode mode, RenderArgs* args) { void Model::endScene(RenderMode mode, RenderArgs* args) {
PROFILE_RANGE(__FUNCTION__); PROFILE_RANGE(__FUNCTION__);
#if (GPU_TRANSFORM_PROFILE == GPU_LEGACY)
// with legacy transform profile, we still to protect that transform stack...
glPushMatrix();
#endif
RenderArgs::RenderSide renderSide = RenderArgs::MONO; RenderArgs::RenderSide renderSide = RenderArgs::MONO;
if (args) { if (args) {
renderSide = args->_renderSide; renderSide = args->_renderSide;
@ -1921,6 +1927,12 @@ void Model::endScene(RenderMode mode, RenderArgs* args) {
backend.render(_sceneRenderBatch); backend.render(_sceneRenderBatch);
} }
#if (GPU_TRANSFORM_PROFILE == GPU_LEGACY)
// with legacy transform profile, we still to protect that transform stack...
glPopMatrix();
#endif
// restore all the default material settings // restore all the default material settings
_viewState->setupWorldLight(); _viewState->setupWorldLight();