From ae41ae32119f8c8105d154f1c96326632cd92fd4 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Mon, 18 Feb 2019 21:43:45 +0100
Subject: [PATCH 1/4] closes https://github.com/assimp/assimp/issues/305': fix
 viewer

---
 code/FBXConverter.cpp             |  3 +--
 code/FBXImporter.cpp              | 13 ++++++++-----
 tools/assimp_view/assimp_view.cpp | 23 ++++++++++++++++-------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp
index d88a3cacd..1bfc90b6d 100644
--- a/code/FBXConverter.cpp
+++ b/code/FBXConverter.cpp
@@ -1291,8 +1291,7 @@ namespace Assimp {
             unsigned int cursor = 0, in_cursor = 0;
 
             itf = faces.begin();
-            for (MatIndexArray::const_iterator it = mindices.begin(),
-                end = mindices.end(); it != end; ++it, ++itf)
+            for (MatIndexArray::const_iterator it = mindices.begin(), end = mindices.end(); it != end; ++it, ++itf)
             {
                 const unsigned int pcount = *itf;
                 if ((*it) != index) {
diff --git a/code/FBXImporter.cpp b/code/FBXImporter.cpp
index 72f8eea8e..2cc8bffc2 100644
--- a/code/FBXImporter.cpp
+++ b/code/FBXImporter.cpp
@@ -60,11 +60,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/importerdesc.h>
 
 namespace Assimp {
-    template<> const char* LogFunctions<FBXImporter>::Prefix()
-    {
-        static auto prefix = "FBX: ";
-        return prefix;
-    }
+
+template<>
+const char* LogFunctions<FBXImporter>::Prefix() {
+    static auto prefix = "FBX: ";
+    return prefix;
+}
+
 }
 
 using namespace Assimp;
@@ -72,6 +74,7 @@ using namespace Assimp::Formatter;
 using namespace Assimp::FBX;
 
 namespace {
+
 static const aiImporterDesc desc = {
     "Autodesk FBX Importer",
     "",
diff --git a/tools/assimp_view/assimp_view.cpp b/tools/assimp_view/assimp_view.cpp
index 355287e0d..1bcdce967 100644
--- a/tools/assimp_view/assimp_view.cpp
+++ b/tools/assimp_view/assimp_view.cpp
@@ -508,19 +508,28 @@ int CreateAssetData()
         unsigned int nidx;
         switch (mesh->mPrimitiveTypes) {
             case aiPrimitiveType_POINT:
-                nidx = 1;break;
+                nidx = 1;
+                break;
             case aiPrimitiveType_LINE:
-                nidx = 2;break;
+                nidx = 2;
+                break;
             case aiPrimitiveType_TRIANGLE:
-                nidx = 3;break;
-            default: ai_assert(false);
+                nidx = 3;
+                break;
+            default: 
+                ai_assert(false);
+                break;
         };
 
+        unsigned int numIndices = mesh->mNumFaces * 3;
+        if (0 == numIndices && nidx == 1) {
+            numIndices = mesh->mNumVertices;
+        }
         // check whether we can use 16 bit indices
-        if (mesh->mNumFaces * 3 >= 65536)	{
+        if (numIndices >= 65536)	{
             // create 32 bit index buffer
             if(FAILED( g_piDevice->CreateIndexBuffer( 4 *
-                mesh->mNumFaces * nidx,
+                numIndices,
                 D3DUSAGE_WRITEONLY | dwUsage,
                 D3DFMT_INDEX32,
                 D3DPOOL_DEFAULT, 
@@ -546,7 +555,7 @@ int CreateAssetData()
         else	{
             // create 16 bit index buffer
             if(FAILED( g_piDevice->CreateIndexBuffer( 2 *
-                mesh->mNumFaces * nidx,
+                numIndices,
                 D3DUSAGE_WRITEONLY | dwUsage,
                 D3DFMT_INDEX16,
                 D3DPOOL_DEFAULT,

From ea2e6936e5c2881e3fb220c2df5a869f796e8a08 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Mon, 18 Feb 2019 21:44:07 +0100
Subject: [PATCH 2/4] Add test file.

---
 test/models/PLY/points.ply | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 test/models/PLY/points.ply

diff --git a/test/models/PLY/points.ply b/test/models/PLY/points.ply
new file mode 100644
index 000000000..91f4bb83b
--- /dev/null
+++ b/test/models/PLY/points.ply
@@ -0,0 +1,17 @@
+ply
+format ascii 1.0
+element vertex 4
+property float x
+property float y
+property float z
+property uchar red
+property uchar green
+property uchar blue
+property float nx
+property float ny
+property float nz
+end_header
+0.0 0.0 0.0 255 255 255 0.0 1.0 0.0
+0.0 0.0 1.0 255 0 255 0.0 0.0 1.0
+0.0 1.0 0.0 255 255 0 1.0 0.0 0.0
+0.0 1.0 1.0 0 255 255 1.0 1.0 0.0

From b0f94c4620b63fefada6e57864f6bd4356a12b94 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Tue, 19 Feb 2019 11:19:53 +0100
Subject: [PATCH 3/4] Update appveyor.yml

Disable vs2015-test
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2b5f212f9..c14553708 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,7 +15,7 @@ matrix:
     
 image:
   - Visual Studio 2013
-  - Visual Studio 2015
+#  - Visual Studio 2015
   - Visual Studio 2017
     
 platform:

From ebf9deb6e0f04116ded902d89e309ef1109d3d0e Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Tue, 19 Feb 2019 11:28:15 +0100
Subject: [PATCH 4/4] Update appveyor.yml

Disable vs2017
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index c14553708..a1890b9cb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,7 +16,7 @@ matrix:
 image:
   - Visual Studio 2013
 #  - Visual Studio 2015
-  - Visual Studio 2017
+#  - Visual Studio 2017
     
 platform:
   - Win32