From a33058fa113357476ec527327e0cf964a00ea9f2 Mon Sep 17 00:00:00 2001
From: Robert Beckebans <robert.beckebans@gmail.com>
Date: Wed, 27 Jan 2021 10:36:33 +0100
Subject: [PATCH] Moved blender/ -> tools/ and added some TrenchBroom docs

---
 README.md                                        | 16 +++++++++-------
 .../scripts/addons/io_export_rbdoom_map_json.py  |  0
 .../addons/io_import_rbdoom_flash_json.py        |  0
 .../scripts/addons/io_import_rbdoom_map_json.py  |  0
 .../scripts/addons/io_import_rbdoom_map_json.py  |  0
 5 files changed, 9 insertions(+), 7 deletions(-)
 rename {blender => tools/blender}/blender-2.7x/scripts/addons/io_export_rbdoom_map_json.py (100%)
 rename {blender => tools/blender}/blender-2.7x/scripts/addons/io_import_rbdoom_flash_json.py (100%)
 rename {blender => tools/blender}/blender-2.7x/scripts/addons/io_import_rbdoom_map_json.py (100%)
 rename {blender => tools/blender}/blender-2.83/scripts/addons/io_import_rbdoom_map_json.py (100%)

diff --git a/README.md b/README.md
index 5ec1fb81..7862fb83 100644
--- a/README.md
+++ b/README.md
@@ -165,12 +165,13 @@ Left: No post processing except HDR tone mapping. Right: r_useFilmicPostProcessi
 
 A short summary of the file layout:
 
-Directory                     | Description
-:---------------------------- | :------------------------------------------------
-RBDOOM-3-BFG/base/            | Doom 3 BFG media directory ( models, textures, sounds, maps, etc. )
-RBDOOM-3-BFG/neo/             | RBDOOM-3-BFG source code ( renderer, game code for multiple games, OS layer, etc. )
-RBDOOM-3-BFG/build/           | Build folder for CMake
-RBDOOM-3-BFG/blender/         | Blender scripts for modding
+Directory                       | Description
+:-----------------------------  | :------------------------------------------------
+RBDOOM-3-BFG/base/              | Doom 3 BFG media directory ( models, textures, sounds, maps, etc. )
+RBDOOM-3-BFG/neo/               | RBDOOM-3-BFG source code ( renderer, game code for multiple games, OS layer, etc. )
+RBDOOM-3-BFG/build/             | Build folder for CMake
+RBDOOM-3-BFG/tools/blender/     | Blender scripts for level mapping
+RBDOOM-3-BFG/tools/trenchbroom  | TrenchBroom level editor for mapping
 
 This release does not contain any game data, the game data is still
 covered by the original EULA and must be obeyed as usual.
@@ -387,7 +388,8 @@ r_useFilmicPostProcessing              | Apply several post process effects to m
 Name                              | Description
 :--------------------------------------| :------------------------------------------------
 exportScriptEvents                     | Command: Generates a new script/doom_events.script that reflects all registered class events in the idClass C++ system. The gamecode still needs to be extended to add the original comments of the events
-exportDeclsToJSON                      | Command: Exports all entity and model defs to exported/entities.json for usage in Blender
+exportEntityDefsToBlender              | Command: Exports all entity and model defs to exported/entities.json for usage in Blender
+exportEntityFGD                        | Command: Exports all entity defs to exported/_tb/*.fgd for usage in TrenchBroom
 postLoadExportModels                   | Cvar: Export models after loading to OBJ model format. Set it to 1 before loading a map.
 exportMapToOBJ                         | Command: Convert .map file to .obj/.mtl
 postLoadExportFlashAtlas               | Cvar: Set to 1 at startup to dump the Flash images to exported/swf/
diff --git a/blender/blender-2.7x/scripts/addons/io_export_rbdoom_map_json.py b/tools/blender/blender-2.7x/scripts/addons/io_export_rbdoom_map_json.py
similarity index 100%
rename from blender/blender-2.7x/scripts/addons/io_export_rbdoom_map_json.py
rename to tools/blender/blender-2.7x/scripts/addons/io_export_rbdoom_map_json.py
diff --git a/blender/blender-2.7x/scripts/addons/io_import_rbdoom_flash_json.py b/tools/blender/blender-2.7x/scripts/addons/io_import_rbdoom_flash_json.py
similarity index 100%
rename from blender/blender-2.7x/scripts/addons/io_import_rbdoom_flash_json.py
rename to tools/blender/blender-2.7x/scripts/addons/io_import_rbdoom_flash_json.py
diff --git a/blender/blender-2.7x/scripts/addons/io_import_rbdoom_map_json.py b/tools/blender/blender-2.7x/scripts/addons/io_import_rbdoom_map_json.py
similarity index 100%
rename from blender/blender-2.7x/scripts/addons/io_import_rbdoom_map_json.py
rename to tools/blender/blender-2.7x/scripts/addons/io_import_rbdoom_map_json.py
diff --git a/blender/blender-2.83/scripts/addons/io_import_rbdoom_map_json.py b/tools/blender/blender-2.83/scripts/addons/io_import_rbdoom_map_json.py
similarity index 100%
rename from blender/blender-2.83/scripts/addons/io_import_rbdoom_map_json.py
rename to tools/blender/blender-2.83/scripts/addons/io_import_rbdoom_map_json.py