# HG changeset patch
# User Ritor1
# Date 1363066453 -21600
# Node ID a32962bca266a1fbf41a218bbd7fb26d6b5e0810
# Parent  8c595c7a32188fda18e9d678ea130f3660652a06# Parent  431a8b0c2bf117959b6864f1a6cde78d9b78e281
Слияние

diff -r 8c595c7a3218 -r a32962bca266 Render.cpp
--- a/Render.cpp	Tue Mar 12 11:34:08 2013 +0600
+++ b/Render.cpp	Tue Mar 12 11:34:13 2013 +0600
@@ -8137,14 +8137,14 @@
       v31 = v31 * -1.0;
     if ( v4->uTintColor && v26->bTinting )
     {
-      v11 = GetActorTintColor(v8, 0, pSoftBillboarda, 0, 0);
+      v11 = ::GetActorTintColor(v8, 0, pSoftBillboarda, 0, 0);
       v12 = sub_4A19D8(v4->uTintColor, v11);
       if ( v28 )
         v12 = (unsigned int)((char *)&array_77EC08[1852].pEdgeList1[17] + 3) & ((unsigned int)v12 >> 1);
     }
     else
     {
-      v12 = GetActorTintColor(v8, 0, pSoftBillboarda, 0, 0);
+      v12 = ::GetActorTintColor(v8, 0, pSoftBillboarda, 0, 0);
     }
     v13 = (double)v25;
     pBillboardRenderListD3D[v9].pQuards[0].specular = 0;