Merge pull request #17284 from gkjohnson/patch-2

mrdoob · web-flow · commit 67a28137d30a · 2019-08-19T13:18:46.000-07:00
ColladaExporter: Add profile="THREEJS" to technique node
diff --git a/examples/js/exporters/ColladaExporter.js b/examples/js/exporters/ColladaExporter.js
@@ -485,7 +485,7 @@ THREE.ColladaExporter.prototype = {
 
 					(
 						m.side === THREE.DoubleSide ?
-							`<extra><technique><double_sided sid="double_sided" type="int">1</double_sided></technique></extra>` :
+							`<extra><technique profile="THREEJS"><double_sided sid="double_sided" type="int">1</double_sided></technique></extra>` :
 							''
 					) +
 
diff --git a/examples/jsm/exporters/ColladaExporter.js b/examples/jsm/exporters/ColladaExporter.js
@@ -496,7 +496,7 @@ ColladaExporter.prototype = {
 
 					(
 						m.side === DoubleSide ?
-							`<extra><technique><double_sided sid="double_sided" type="int">1</double_sided></technique></extra>` :
+							`<extra><technique profile="THREEJS"><double_sided sid="double_sided" type="int">1</double_sided></technique></extra>` :
 							''
 					) +
 

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ THREE.ColladaExporter.prototype = {`
`485`	`485`
`486`	`486`	`(`
`487`	`487`	`m.side === THREE.DoubleSide ?`
`488`		- `<extra><technique><double_sided sid="double_sided" type="int">1</double_sided></technique></extra>` :
	`488`	+ `<extra><technique profile="THREEJS"><double_sided sid="double_sided" type="int">1</double_sided></technique></extra>` :
`489`	`489`	`''`
`490`	`490`	`) +`
`491`	`491`
Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@ ColladaExporter.prototype = {`
`496`	`496`
`497`	`497`	`(`
`498`	`498`	`m.side === DoubleSide ?`
`499`		- `<extra><technique><double_sided sid="double_sided" type="int">1</double_sided></technique></extra>` :
	`499`	+ `<extra><technique profile="THREEJS"><double_sided sid="double_sided" type="int">1</double_sided></technique></extra>` :
`500`	`500`	`''`
`501`	`501`	`) +`
`502`	`502`