diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-29 17:11:25 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-29 17:11:25 +0200 |
| commit | cb8f159cea6d6895c1412fa74d209a3dc2298c4b (patch) | |
| tree | 56944635f2e06854637f5c689028dcbfd2ede8b5 /src/tools | |
| parent | a08b52aa197a31b9821f3f9ef425da6365065907 (diff) | |
| parent | 1bb3c4a2b4e3e974f09c0df478245f8daa3a677c (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_priest.cpp
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index 9dfdf95643d..06a764690ca 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -716,8 +716,8 @@ namespace MMAP params.cs = config.cs; params.ch = config.ch; params.tileLayer = 0; - params.buildBvTree = true; - + params.buildBvTree = true; + // will hold final navmesh unsigned char* navData = NULL; int navDataSize = 0; |