Fixed|Model Renderer: Use default rendering passes if none defined

skyjake · Oct 21, 2015 · 17d89e6 · 17d89e6
1 parent cf4b167
commit 17d89e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/doomsday/apps/client/src/render/stateanimator.cpp b/doomsday/apps/client/src/render/stateanimator.cpp
@@ -219,7 +219,10 @@ DENG2_PIMPL(StateAnimator)
         initVariables();
 
         // Set up the appearance.
-        appearance.drawPasses = &auxData->passes;
+        if(!auxData->passes.isEmpty())
+        {
+            appearance.drawPasses = &auxData->passes;
+        }
         appearance.programCallback = [this] (GLProgram &program, ModelDrawable::ProgramBinding binding)
         {
             self.bindUniforms(program,

diff --git a/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp b/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp
@@ -703,7 +703,7 @@ DENG2_PIMPL(ModelDrawable)
         Pass pass;
         pass.meshes.resize(scene->mNumMeshes);
         pass.meshes.fill(true);
-        defaultPasses.append(pass);
+        defaultPasses << pass;
     }
 
     void buildNodeLookup(aiNode const &node)