Skip to content

Commit 554e702

Browse files
dforrerdforrer
committed
Merge remote-tracking branch 'mrdoob/dev' into dev
2 parents 2645c32 + 9dfe76e commit 554e702

10 files changed

Lines changed: 557 additions & 121 deletions

‎editor/css/main.css‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,18 @@ textarea, input { outline: none; } /* osx */
116116
color: #8888ee;
117117
}
118118

119+
.Line {
120+
color: #88ee88;
121+
}
122+
123+
.LineSegments {
124+
color: #88ee88;
125+
}
126+
127+
.Points {
128+
color: #ee8888;
129+
}
130+
119131
/* */
120132

121133
.PointLight {

‎examples/js/loaders/ColladaLoader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120

121121
parse: function( text ) {
122122

123-
COLLADA = new DOMParser().parseFromString( text, 'text/xml' );
123+
COLLADA = new DOMParser().parseFromString( text, 'application/xml' );
124124

125125
this.parseAsset();
126126
this.setUpConversion();

0 commit comments

Comments
 (0)