From 19b4b8e0b0561693ff2590e3c715fcb25b4298b6 Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Fri, 15 Oct 2021 07:36:28 -0700 Subject: [PATCH 1/3] Fix irrelevant fade distance warning. --- korman/ui/modifiers/render.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/korman/ui/modifiers/render.py b/korman/ui/modifiers/render.py index fe17821..b660872 100644 --- a/korman/ui/modifiers/render.py +++ b/korman/ui/modifiers/render.py @@ -162,7 +162,8 @@ def fademod(modifier, layout, context): col.prop(modifier, "far_opaq") col.prop(modifier, "far_trans") - if not (modifier.near_trans <= modifier.near_opaq <= modifier.far_opaq <= modifier.far_trans): + if (modifier.fader_type in ("SimpleDist", "DistOpacity") and + not (modifier.near_trans <= modifier.near_opaq <= modifier.far_opaq <= modifier.far_trans)): # Warn the user that the values are not recommended. layout.label("Distance values must be equal or increasing!", icon="ERROR") From d06ac03084dad05496f8efd059b97ad7833801d2 Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Fri, 15 Oct 2021 07:46:25 -0700 Subject: [PATCH 2/3] Export CI for plFadeOpacityMods. plFadeOpacityMods require a Coordinate Interface to correctly calculate LOS. --- korman/properties/modifiers/render.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/korman/properties/modifiers/render.py b/korman/properties/modifiers/render.py index 8916b9d..08adaec 100644 --- a/korman/properties/modifiers/render.py +++ b/korman/properties/modifiers/render.py @@ -264,6 +264,13 @@ class PlasmaFadeMod(PlasmaModifierProperties): mod.nearOpaq = 0.0 mod.farOpaq = self.far_opaq mod.farTrans = self.far_trans + + @property + def requires_actor(self): + if self.fader_type == "FadeOpacity": + return True + else: + return False class PlasmaFollowMod(idprops.IDPropObjectMixin, PlasmaModifierProperties): From c0a6d0e3a68151d09e959ffc39d17abca6639eac Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Fri, 15 Oct 2021 08:11:12 -0700 Subject: [PATCH 3/3] Simplify Opacity Fader CI condition. Co-authored-by: Adam Johnson --- korman/properties/modifiers/render.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/korman/properties/modifiers/render.py b/korman/properties/modifiers/render.py index 08adaec..7ec6493 100644 --- a/korman/properties/modifiers/render.py +++ b/korman/properties/modifiers/render.py @@ -267,10 +267,7 @@ class PlasmaFadeMod(PlasmaModifierProperties): @property def requires_actor(self): - if self.fader_type == "FadeOpacity": - return True - else: - return False + return self.fader_type == "FadeOpacity" class PlasmaFollowMod(idprops.IDPropObjectMixin, PlasmaModifierProperties):