Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinier de Blois <rddeblois@gmail.com>2016-04-05 21:38:42 +0300
committerPorteries Tristan <republicthunderbolt9@gmail.com>2016-04-05 22:39:04 +0300
commitc084520b0376c4ab92cb0193577a79cf23e5bb80 (patch)
tree645f35cdaa87464bb55e5c2b5657f86a142fedb2 /release/scripts/startup/bl_ui/properties_game.py
parent176538f61360fb54f0e4ce209fc7d7632bce1401 (diff)
Expose new Recast partitioning methods for navmesh generation
This patch depends on D1747, which upgrades the Recast version. It exposes the new Recast partitioning methods in the navmesh generation. Reviewers: campbellbarton, moguri Reviewed By: moguri Projects: #bf_blender Differential Revision: https://developer.blender.org/D1748
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_game.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_game.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
index ed1253ea3bf..8baad4ea0f2 100644
--- a/release/scripts/startup/bl_ui/properties_game.py
+++ b/release/scripts/startup/bl_ui/properties_game.py
@@ -510,7 +510,11 @@ class SCENE_PT_game_navmesh(SceneButtonsPanel, Panel):
col.label(text="Region:")
row = col.row()
row.prop(rd, "region_min_size")
- row.prop(rd, "region_merge_size")
+ if rd.partitioning != 'LAYERS':
+ row.prop(rd, "region_merge_size")
+
+ col = layout.column()
+ col.prop(rd, "partitioning")
col = layout.column()
col.label(text="Polygonization:")