Merge pull request #199 from blackberry-gaming/next

Next

gameplay/src/Model.cpp

@@ -393,9 +393,22 @@ Model* Model::clone(NodeCloneContext &context)
             GP_ERROR("Failed to clone material for model.");
             return model;
         }
-        model->setMaterial(materialClone); // TODO: Don't forget material parts
+        model->setMaterial(materialClone);
         materialClone->release();
     }
+    if (_partMaterials)
+    {
+        GP_ASSERT(_partCount == model->_partCount);
+        for (unsigned int i = 0; i < _partCount; ++i)
+        {
+            if (_partMaterials[i])
+            {
+                Material* materialClone = _partMaterials[i]->clone(context);
+                model->setMaterial(materialClone, i);
+                materialClone->release();
+            }
+        }
+    }
     return model;
 }
 

gameplay/src/PlatformQNX.cpp

@@ -957,7 +957,7 @@ int Platform::enterMessagePump()
                 switch (bps_event_get_code(event))
                 {
                 case NAVIGATOR_SWIPE_DOWN:
-                    _game->menu();
+                    _game->menuEvent();
                     break;
                 case NAVIGATOR_WINDOW_STATE:
                 {