From 9a701674321de6eb57ee945700e4651f1f8b2db9 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Fri, 20 Nov 2015 20:52:10 -0500 Subject: [PATCH] ObjectLoader: Handle AmbientLight intensity. --- editor/js/Sidebar.Object3D.js | 2 +- src/loaders/ObjectLoader.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/editor/js/Sidebar.Object3D.js b/editor/js/Sidebar.Object3D.js index 7804e95674..913a76485b 100644 --- a/editor/js/Sidebar.Object3D.js +++ b/editor/js/Sidebar.Object3D.js @@ -20,7 +20,7 @@ Sidebar.Object3D = function ( editor ) { // Actions - var objectActions = new UI.Select().setPosition('absolute').setRight( '8px' ).setFontSize( '11px' ); + var objectActions = new UI.Select().setPosition( 'absolute' ).setRight( '8px' ).setFontSize( '11px' ); objectActions.setOptions( { 'Actions': 'Actions', diff --git a/src/loaders/ObjectLoader.js b/src/loaders/ObjectLoader.js index 69c4d811e0..da4cf2cd16 100755 --- a/src/loaders/ObjectLoader.js +++ b/src/loaders/ObjectLoader.js @@ -319,7 +319,7 @@ THREE.ObjectLoader.prototype = { for ( var i = 0; i < json.length; i ++ ) { - var clip = THREE.AnimationClip.parse( json[i] ); + var clip = THREE.AnimationClip.parse( json[ i ] ); animations.push( clip ); @@ -485,7 +485,7 @@ THREE.ObjectLoader.prototype = { case 'AmbientLight': - object = new THREE.AmbientLight( data.color ); + object = new THREE.AmbientLight( data.color, data.intensity ); break; -- GitLab