repo: janusweb
action: commit
revision: 
path_from: 
revision_from: a1c39a1edf0b326c8cfc4e63dc123f1e2fb64967:
path_to: 
revision_to: 

commit a1c39a1edf0b326c8cfc4e63dc123f1e2fb64967
Author: James Baicoianu 
Date:   Mon Jul 13 10:08:48 2020 -0700

    Added `shadertype` attribute for ``

diff --git a/scripts/external/JanusFireboxParser.js b/scripts/external/JanusFireboxParser.js

--- a/scripts/external/JanusFireboxParser.js
+++ b/scripts/external/JanusFireboxParser.js
@@ -125,7 +125,8 @@ JanusFireboxParser.prototype.parseAssets = function(xml, baseurl, datapath) {
     assetlist.push({
       assettype: 'shader',
       name: n.id,
-      fragment_src: n.src,
+      shadertype: n.shadertype || 'default',
+      fragment_src: n.src || n.fragment_src,
       vertex_src: n.vertex_src,
       uniforms: n.uniforms,
       baseurl: baseurl,

-----END OF PAGE-----