mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 09:20:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

solve merge conflict

Browse Source
This commit is contained in:
Michael Nilsson
2016-04-01 16:39:35 -04:00
parent f4964b1628 f7643769d9
commit 66a9aeb008
6 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/rendering/textureplane.cpp
+2
View File
@@ -144,6 +144,8 @@ void TexturePlane::render(){
}
void TexturePlane::update(){
//if(_planeIsDirty)
// createPlane();
if(_path != ""){
CygnetPlane::update();
if(_futureTexture && _futureTexture->isFinished){