[Crystal-cvs] SF.net SVN: crystal: [26558] CS/trunk

[<re...@us...>]

Revision: 26558
          http://svn.sourceforge.net/crystal/?rev=26558&view=rev
Author:   res2002
Date:     2007-03-06 04:04:16 -0800 (Tue, 06 Mar 2007)

Log Message:
-----------
res fixed some more r26546 fallout.

Modified Paths:
--------------
    CS/trunk/docs/history.txt
    CS/trunk/plugins/mesh/genmesh/object/genmesh.cpp

Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt	2007-03-06 11:58:31 UTC (rev 26557)
+++ CS/trunk/docs/history.txt	2007-03-06 12:04:16 UTC (rev 26558)
@@ -23,6 +23,7 @@
 	  obtained from the given iRenderView) and also made the
 	  cached string id's static so that they are *really* cached
 	  now.
+	- res fixed some more r26546 fallout.
 5-Mar-2007
 	- iceeey fixed some errors and warnings in basemapgen on GCC.
 	- sueastside fixed a crash in basemapgen caused by a copy/paste error.

Modified: CS/trunk/plugins/mesh/genmesh/object/genmesh.cpp
===================================================================
--- CS/trunk/plugins/mesh/genmesh/object/genmesh.cpp	2007-03-06 11:58:31 UTC (rev 26557)
+++ CS/trunk/plugins/mesh/genmesh/object/genmesh.cpp	2007-03-06 12:04:16 UTC (rev 26558)
@@ -978,11 +978,23 @@
     lighting_dirty = false;
     mesh_colors_dirty_flag = true;
 
-    for (i = 0 ; i < factory->GetVertexCount () ; i++)
+    if (factory_colors)
     {
-      lit_mesh_colors[i] = base_color + factory_colors[i];
-      lit_mesh_colors[i].Clamp (2., 2., 2.);
+      for (i = 0 ; i < factory->GetVertexCount () ; i++)
+      {
+        lit_mesh_colors[i] = base_color + factory_colors[i];
+        lit_mesh_colors[i].Clamp (2., 2., 2.);
+      }
     }
+    else
+    {
+      csColor4 base_color_clamped (base_color);
+      base_color_clamped.Clamp (2., 2., 2.);
+      for (i = 0 ; i < factory->GetVertexCount () ; i++)
+      {
+        lit_mesh_colors[i] = base_color_clamped;
+      }
+    }
   }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.