From 68dbf929a2c024d0cbc3086ff15865a7125844af Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 18 Apr 2015 16:14:25 +1000
Subject: [PATCH] Add updated pathgrid marker nif file and fix merge issues.

---
 apps/opencs/view/render/cell.cpp |   3 +--
 apps/opencs/view/render/cell.hpp |   3 ---
 files/materials/pathgrid_pt.nif  | Bin 1683 -> 1484 bytes
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index d13649d3ee..ef63909afa 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -93,7 +93,7 @@ bool CSVRender::Cell::addObjects (int start, int end)
     bool modified = false;
 
     const CSMWorld::RefCollection& collection = mData.getReferences();
-    
+
     for (int i=start; i<=end; ++i)
     {
         std::string cell = Misc::StringUtils::lowerCase (collection.getRecord (i).get().mCell);
@@ -177,7 +177,6 @@ CSVRender::Cell::~Cell()
     if (mTerrain.get())
         mPhysics->removeHeightField(mSceneMgr, mX, mY);
 
-
     for (std::map<std::string, Object *>::iterator iter (mObjects.begin());
         iter!=mObjects.end(); ++iter)
         delete iter->second;
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index e504fc7a48..0afd0920b3 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -11,11 +11,8 @@
 
 #ifndef Q_MOC_RUN
 #include <components/terrain/terraingrid.hpp>
-<<<<<<< .mine
 #include <components/esm/loadpgrd.hpp>  // FIXME: temporaty storage until saving to document
-=======
 #endif
->>>>>>> .theirs
 
 #include "object.hpp"
 
diff --git a/files/materials/pathgrid_pt.nif b/files/materials/pathgrid_pt.nif
index 579b03036c05d5deefe564880dbe312ebbb671f2..cc37e0ee37ef732d4b42d2aadde343580bbd717c 100644
GIT binary patch
literal 1484
zcmb7E%}&BV5FVrmA_{^(9C-jk(0K4*Bp5X@(ME&uYE~`Mq)1ci!5eQz;#ptA8;@Z0
zo9(V_q4+ao*>7gP`N^<@?Sv=2o)bJewPV-AS3l^9aI<y=liPo&?bI9iZ0F~QtQ--|
z<Jhj<zjKy>d=Yl<1NZLQ53g^$PbCF-Oc^vyjVMW<v_%o9N+}$!%96*i-OIpjcZKhi
zpv60=HFOUa(+!!-pQOiaX+(2<zIC<?Fjpwzw%wNJcg1<o_njbohDEyAJt|XKGTOd#
z`{aoriIh^DGZ8w0D?H8N>1kWN(b(dIEIfxuI-U3ZG45cx1L*o_58r#Ox7X7q|5D?r
z9g0v?<y2uF@Ok(+Iv^^%M2Bq!r6*$eq=2VmBLnhq4vtlvSRUnLu35|M!NjpVM(k8A
z_++2VG4VmfH1ot_nXfogc9};{e3ZEu?!HyzD^9|&Ngs3mfQJTW5)Zi(l_wFyJ>YoN
z&n!&faL+Qw518|4&J^Z2)erZXh}o|tdPiEzQB}eewkS;&Ww6Cr%FzP0c##UUM9Wm9
z60KklDzr*#v`!m{_;ts>H^S1T)E(bn45}F?us&&v7+GArW7C^5|KClS^`c^S-Pi1i
b@yz&tCynW4R1aw&3wjE7G*L@>^gI0m*A66H

literal 1683
zcmb_c&2G~`5T2w?TS{o5<)=VFsl*Xg0afBs5fvdM4p>M<NE}dPwVTFLLadEBRN~+V
z;02o3sJOOLU!vj-xbO;u?_00qpSUy!##-+;GvCgP*Sq7Y@NK`Z^iVb4_&vM^y6=Tg
z8y{iv2VWZ7TTMLAm#QMpqKM36xV}3$P%A*eVLJ%hS{<}|o<3A#D|NWC61B3LNSR)=
z#Ve3jDi};lS;BDr58B`BdVyMlmX;87kB0vKu+dD)aJV8P#S~?F-ZqETEP-<ptp>~t
z{C?Np?FC)$y&eQghexm&7u~;CWz{hD0=54Y+fzoWSk5~yRND7?35Oe)*tVL@XADTG
z$msazOQxZWjz48KHiA7Fu|IzA>~=bx)-sfI<6e8A_t<Q#Nc~kj$Ts*KAOgnBF~Q(X
zB>M49L(g%nZumu9vX(p%#5uQlEoZ8R#7-VYypD5R1EVB3_buexwNtrloXhIZ@iTF9
z{Hz^${+)}5IF;yZR(x^t`RvblZ2ox}hRvJ-a%RA%8BP(Knrxg>jG7~^xAk0x1sv9V
z%5N;g-(S>Q9HU>GX1)qD24gYiESTIxGG_#)x;!zCin-NQ+-pZ_Xf6w~DA&+ju7hzy
zmSsh5$}QZ@HMuQ!<gVP4b-dT*zC4hJvVr%8JVK;d+R^0lI!R4-&bJ!ut@)8DiF(l%
zdlxXV9ZX;9`TuaKvxh&ehUn_etRg>;I=7Xbdk!1z;9(1`L8re49DCSSsnHYnc}(&b
DaQ$}<