Fixed entity ref still displayed while disabled (#1000, #759)

deepnight · Dec 28, 2023 · f5cc7a2 · f5cc7a2
1 parent 850ca2d
commit f5cc7a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/electron.renderer/data/def/FieldDef.hx b/src/electron.renderer/data/def/FieldDef.hx
@@ -580,6 +580,15 @@ class FieldDef {
 	}
 
 
+	public function refLinkIsDisplayed() {
+		return switch editorDisplayMode {
+			case RefLinkBetweenPivots: true;
+			case RefLinkBetweenCenters: true;
+			case _: false;
+		}
+	}
+
+
 	public function acceptsEntityRefTo(sourceEi:data.inst.EntityInstance, targetEd:data.def.EntityDef, targetLevel:Level) {
 		if( type!=F_EntityRef || sourceEi==null || targetEd==null || targetLevel==null )
 			return false;

diff --git a/src/electron.renderer/data/inst/EntityInstance.hx b/src/electron.renderer/data/inst/EntityInstance.hx
@@ -323,7 +323,7 @@ class EntityInstance {
 				return null;
 
 			for(i in 0...fi.getArrayLength())
-				if( fi.getEntityRefIid(i)==targetEi.iid && ( !onlyIfLinkIsDisplayed || fi.def.editorDisplayMode==RefLinkBetweenCenters || fi.def.editorDisplayMode==RefLinkBetweenPivots ) )
+				if( fi.getEntityRefIid(i)==targetEi.iid && ( !onlyIfLinkIsDisplayed || fi.def.refLinkIsDisplayed() ) )
 					return fi;
 		}
 		return null;

diff --git a/src/electron.renderer/display/EntityRender.hx b/src/electron.renderer/display/EntityRender.hx
@@ -315,7 +315,7 @@ class EntityRender extends dn.Process {
 				continue;
 
 			var fi = refEi.getEntityRefFieldTo(ei,true);
-			if( fi==null )
+			if( fi==null || !fi.def.refLinkIsDisplayed() )
 				continue;
 
 			var col = refEi.getSmartColor(false);