diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-30 01:28:18 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-30 01:28:18 +0400 |
| commit | 29f214f7f31bf7490b0c2795ad716ce5a9dc1818 (patch) | |
| tree | fa9cb969c253e58c71c0dd61e89731f185849030 /source/gameengine/Ketsji/KX_KetsjiEngine.cpp | |
| parent | ce1c78e18bf41115a8a149dd85115292c1919bea (diff) | |
| parent | 6a27da310c61b3372d565060506221a5afb9fe43 (diff) | |
Merging up to trunk r38834.
Diffstat (limited to 'source/gameengine/Ketsji/KX_KetsjiEngine.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_KetsjiEngine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index ac018752444..651450f01bf 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -1232,7 +1232,7 @@ void KX_KetsjiEngine::RenderFrame(KX_Scene* scene, KX_Camera* cam) projmat.setValue(m_overrideCamProjMat.getPointer()); cam->SetProjectionMatrix(projmat); } - } else if (cam->hasValidProjectionMatrix() && !cam->GetViewport() ) + } else if (cam->hasValidProjectionMatrix()) { m_rasterizer->SetProjectionMatrix(cam->GetProjectionMatrix()); } else |