From d5d375834f9ad3bde03ac756817a84ad5d433016 Mon Sep 17 00:00:00 2001 From: MaxED Date: Mon, 29 Jun 2015 08:15:07 +0000 Subject: [PATCH] Fixed, Visual mode: model visibility filtering was checked incorrectly when using "Show models for current things filter only" model rendering mode. --- Source/Core/Rendering/Renderer3D.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Core/Rendering/Renderer3D.cs b/Source/Core/Rendering/Renderer3D.cs index 0b97f2d0..bfd3f48e 100644 --- a/Source/Core/Rendering/Renderer3D.cs +++ b/Source/Core/Rendering/Renderer3D.cs @@ -852,7 +852,10 @@ namespace CodeImp.DoomBuilder.Rendering foreach(VisualThing t in group.Value) { //mxd - if(t.Thing.IsModel && General.Settings.GZDrawModelsMode != ModelRenderMode.NONE && (General.Settings.GZDrawModelsMode == ModelRenderMode.ALL || t.Selected)) + if(t.Thing.IsModel && + (General.Settings.GZDrawModelsMode == ModelRenderMode.ALL || + General.Settings.GZDrawModelsMode == ModelRenderMode.ACTIVE_THINGS_FILTER || + (General.Settings.GZDrawModelsMode == ModelRenderMode.SELECTION && t.Selected))) continue; // Update buffer if needed @@ -1237,7 +1240,10 @@ namespace CodeImp.DoomBuilder.Rendering } //mxd. gather models - if(t.Thing.IsModel && General.Settings.GZDrawModelsMode != ModelRenderMode.NONE && (General.Settings.GZDrawModelsMode == ModelRenderMode.ALL || t.Selected)) + if(t.Thing.IsModel && + (General.Settings.GZDrawModelsMode == ModelRenderMode.ALL || + General.Settings.GZDrawModelsMode == ModelRenderMode.ACTIVE_THINGS_FILTER || + (General.Settings.GZDrawModelsMode == ModelRenderMode.SELECTION && t.Selected))) { ModelData mde = General.Map.Data.ModeldefEntries[t.Thing.Type]; if (!thingsWithModel.ContainsKey(mde))