Fix IFCObjectDefaults: types with no props not falling back on "DEFAULT"

#276
xeokit · May 12, 2020 · b3e6ce3 · b3e6ce3
1 parent 2d41c8b
commit b3e6ce3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/plugins/XKTLoaderPlugin/parsers/ParserV1.js b/src/plugins/XKTLoaderPlugin/parsers/ParserV1.js
@@ -96,7 +96,7 @@ function load(viewer, options, inflatedData, performanceModel) {
                 continue;
             }
 
-            const props = options.objectDefaults ? options.objectDefaults[metaObject.type || "DEFAULT"] : null;
+            const props = options.objectDefaults ? options.objectDefaults[metaObject.type] || options.objectDefaults["DEFAULT"] : null;
 
             if (props) {
                 if (props.visible === false) {

diff --git a/src/plugins/XKTLoaderPlugin/parsers/ParserV2.js b/src/plugins/XKTLoaderPlugin/parsers/ParserV2.js
@@ -115,7 +115,7 @@ function load(viewer, options, inflatedData, performanceModel) {
             if (options.includeTypesMap && metaObject.type && (!options.includeTypesMap[metaObject.type])) {
                 continue;
             }
-            const props = options.objectDefaults ? options.objectDefaults[metaObject.type || "DEFAULT"] : null;
+            const props = options.objectDefaults ? options.objectDefaults[metaObject.type] || options.objectDefaults["DEFAULT"] : null;
             if (props) {
                 if (props.visible === false) {
                     entityDefaults.visible = false;

diff --git a/src/plugins/XKTLoaderPlugin/parsers/ParserV3.js b/src/plugins/XKTLoaderPlugin/parsers/ParserV3.js
@@ -109,7 +109,7 @@ function load(viewer, options, inflatedData, performanceModel) {
                 continue;
             }
 
-            const props = options.objectDefaults ? options.objectDefaults[metaObject.type || "DEFAULT"] : null;
+            const props = options.objectDefaults ? options.objectDefaults[metaObject.type] || options.objectDefaults["DEFAULT"] : null;
 
             if (props) {
                 if (props.visible === false) {