From bc82c6a35da5c6d46581b91afcfb5300fd360b53 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 27 Aug 2017 21:22:44 +0000
Subject: [PATCH] Use white color if told to use nonexisting vertexcolors
 (Fixes #3833)

---
 components/nifosg/nifloader.cpp | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 522cf6ac3c..78186c439f 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -1710,10 +1710,8 @@ namespace NifOsg
                     const Nif::NiVertexColorProperty* vertprop = static_cast<const Nif::NiVertexColorProperty*>(property);
                     lightmode = vertprop->data.lightmode;
 
-                    if (hasVertexColors)
+                    switch (vertprop->data.vertmode)
                     {
-                        switch (vertprop->data.vertmode)
-                        {
                         case 0:
                             mat->setColorMode(osg::Material::OFF);
                             break;
@@ -1726,7 +1724,6 @@ namespace NifOsg
                             else
                                 mat->setColorMode(osg::Material::OFF);
                             break;
-                        }
                     }
                     break;
                 }
@@ -1788,6 +1785,27 @@ namespace NifOsg
                 mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f());
             }
 
+            // If we're told to use vertex colors but there are none to use, use a default color instead.
+            if (!hasVertexColors)
+            {
+                switch (mat->getColorMode())
+                {
+                case osg::Material::AMBIENT:
+                    mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+                    break;
+                case osg::Material::AMBIENT_AND_DIFFUSE:
+                    mat->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+                    mat->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+                    break;
+                case osg::Material::EMISSION:
+                    mat->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4f(1,1,1,1));
+                    break;
+                default:
+                    break;
+                }
+                mat->setColorMode(osg::Material::OFF);
+            }
+
             if (!hasMatCtrl && mat->getColorMode() == osg::Material::OFF
                     && mat->getEmission(osg::Material::FRONT_AND_BACK) == osg::Vec4f(0,0,0,1)
                     && mat->getDiffuse(osg::Material::FRONT_AND_BACK) == osg::Vec4f(1,1,1,1)