# HG changeset patch
# User Ritor1
# Date 1360727562 -21600
# Node ID 3a8e7802f2410fe7f60ce1fb73d27ebddb40ad5b
# Parent  49e74dee4eabc00757f6903c8f03d268db0d9b38# Parent  f4ebd13c2a8e6aa88701037503800bc828647feb
Слияние

diff -r f4ebd13c2a8e -r 3a8e7802f241 Outdoor.cpp
--- a/Outdoor.cpp	Wed Feb 13 01:26:49 2013 +0600
+++ b/Outdoor.cpp	Wed Feb 13 09:52:42 2013 +0600
@@ -141,7 +141,7 @@
     pRenderer->PrepareDecorationsRenderList_ODM();
 
   pRenderer->DrawLayingItems_Shooting_Magic_ODM();
-  pRenderer->TransformBillboardsAndSetPalettesODM();//Ritor1: do comment to test
+  pRenderer->TransformBillboardsAndSetPalettesODM();
   sub_485F53((Vec2_int_ *)unnamed_6BE060);
 }
 
diff -r f4ebd13c2a8e -r 3a8e7802f241 Render.cpp
--- a/Render.cpp	Wed Feb 13 01:26:49 2013 +0600
+++ b/Render.cpp	Wed Feb 13 09:52:42 2013 +0600
@@ -7172,7 +7172,7 @@
   if (pRenderD3D)
   {
     pGame->draw_debug_outlines();
-    DoRenderBillboards_D3D(); //Ritor1: it's temporarily
+    DoRenderBillboards_D3D();
     pGame->pStru6Instance->RenderSpecialEffects();
     pRenderD3D->pDevice->EndScene();
   }
diff -r f4ebd13c2a8e -r 3a8e7802f241 mm7_2.cpp
--- a/mm7_2.cpp	Wed Feb 13 01:26:49 2013 +0600
+++ b/mm7_2.cpp	Wed Feb 13 09:52:42 2013 +0600
@@ -16344,7 +16344,7 @@
       UI_CreateTravelDialogue();
     }
   }
-  UpdateActors_ODM();//Ritor1: it's temporarily
+  UpdateActors_ODM();
   _46CC4B_check_event_triggers();
 }