From 582f2885cdcea23e3dddc048ff4ebe8d0b3c586f Mon Sep 17 00:00:00 2001 From: Marcel Schindler Date: Fri, 7 Sep 2018 16:22:53 +0200 Subject: [PATCH] !R (CE-18218) (Sandbox) Changed default value in sandbox for IgnoreDecalBlending to false instead of true Copied from Perforce Change: 1847766 --- .../Module/DefaultComponents/Geometry/BaseMeshComponent.h | 2 +- Code/Sandbox/EditorQt/Objects/BrushObject.cpp | 2 +- Code/Sandbox/Plugins/CryDesigner/Objects/DesignerObject.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Code/CryPlugins/CryDefaultEntities/Module/DefaultComponents/Geometry/BaseMeshComponent.h b/Code/CryPlugins/CryDefaultEntities/Module/DefaultComponents/Geometry/BaseMeshComponent.h index 5cc3aeab0..d9d21e249 100644 --- a/Code/CryPlugins/CryDefaultEntities/Module/DefaultComponents/Geometry/BaseMeshComponent.h +++ b/Code/CryPlugins/CryDefaultEntities/Module/DefaultComponents/Geometry/BaseMeshComponent.h @@ -119,7 +119,7 @@ struct SRenderParameters EMiniumSystemSpec m_castShadowSpec = EMiniumSystemSpec::Always; bool m_bIgnoreVisAreas = false; bool m_bIgnoreTerrainLayerBlend = true; - bool m_bIgnoreDecalBlend = true; + bool m_bIgnoreDecalBlend = false; Schematyc::Range<0, 100, 0, 100, int> m_viewDistanceRatio = 100; Schematyc::Range<0, 100, 0, 100, int> m_lodDistance = 100; EMeshGIMode m_giMode = EMeshGIMode::Disabled; diff --git a/Code/Sandbox/EditorQt/Objects/BrushObject.cpp b/Code/Sandbox/EditorQt/Objects/BrushObject.cpp index 3c396f66a..c39dd7f88 100644 --- a/Code/Sandbox/EditorQt/Objects/BrushObject.cpp +++ b/Code/Sandbox/EditorQt/Objects/BrushObject.cpp @@ -122,7 +122,7 @@ CBrushObject::CBrushObject() mv_Occluder = false; mv_drawLast = false; mv_ignoreTerrainLayerBlend = true; - mv_ignoreDecalBlend = true; + mv_ignoreDecalBlend = false; mv_shadowLodBias = 0; static string sVarName_OutdoorOnly = "IgnoreVisareas"; diff --git a/Code/Sandbox/Plugins/CryDesigner/Objects/DesignerObject.cpp b/Code/Sandbox/Plugins/CryDesigner/Objects/DesignerObject.cpp index 2000caf40..c89246be8 100644 --- a/Code/Sandbox/Plugins/CryDesigner/Objects/DesignerObject.cpp +++ b/Code/Sandbox/Plugins/CryDesigner/Objects/DesignerObject.cpp @@ -627,7 +627,7 @@ DesignerObjectFlags::DesignerObjectFlags() : m_pObj(NULL) excludeCollision = false; occluder = false; ignoreTerrainLayerBlend = true; - ignoreDecalBlend = true; + ignoreDecalBlend = false; } void DesignerObjectFlags::Set() -- 2.11.4.GIT