Merge pull request #1131 from AtomicGameEngine/JME-ATOMIC-CPLUSPLUSEXAMPLES

Hooking in C++ feature examples

CMakeLists.txt

@@ -74,3 +74,15 @@ if (ATOMIC_WEBVIEW)
 endif()
 
 add_subdirectory(Source)
+
+
+
+if (ATOMIC_DESKTOP AND ATOMIC_DEV_BUILD)
+
+    set (ATOMIC_CPLUSPLUS_EXAMPLES 1)
+
+    if (ATOMIC_CPLUSPLUS_EXAMPLES)
+        add_subdirectory(Submodules/AtomicExamples/FeatureExamples/CPlusPlus)
+    endif()
+
+endif()

Source/Atomic/Graphics/Model.cpp

@@ -718,7 +718,8 @@ SharedPtr<Model> Model::Clone(const String& cloneName) const
         for (unsigned j = 0; j < geometries_[i].Size(); ++j)
         {
             // ATOMIC BEGIN
-            ret->geometryNames_[i] = geometryNames_[i];
+            if (ret->geometryNames_.Size())
+                ret->geometryNames_[i] = geometryNames_[i];
             // ATOMIC END
 
             SharedPtr<Geometry> cloneGeometry;

Submodules/AtomicExamples

@@ -1 +1 @@
-Subproject commit 99cf8f6c51ad2702899d44e236ae9765b562970d
+Subproject commit 10cd29c86ab3a9b6902a4c9e93e07c5d4bf736d6