Skip to content

T
three.js

Ablesons / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

体验新版 GitCode，发现更多精彩内容 >>

提交 8faa50b7 编写于 作者: G Greg Tatum
浏览文件
操作

Merge remote-tracking branch 'upstream/dev' into documentation_updates2

上级 4635e82c 0940321b
隐藏空白更改
内联 并排
Showing with 6 addition and 6 deletion
editor/js/Sidebar.Material.js
浏览文件 @ 8faa50b7
...@@ -611,25 +611,25 @@ Sidebar.Material = function ( editor ) { ...@@ -611,25 +611,25 @@ Sidebar.Material = function ( editor ) {
if ( material.color !== undefined ) { if ( material.color !== undefined ) {
materialColor.setValue( '#' + material.color.getHexString() ); materialColor.setHexValue( material.color.getHexString() );
} }
if ( material.ambient !== undefined ) { if ( material.ambient !== undefined ) {
materialAmbient.setValue( '#' + material.ambient.getHexString() ); materialAmbient.setHexValue( material.ambient.getHexString() );
} }
if ( material.emissive !== undefined ) { if ( material.emissive !== undefined ) {
materialEmissive.setValue( '#' + material.emissive.getHexString() ); materialEmissive.setHexValue( material.emissive.getHexString() );
} }
if ( material.specular !== undefined ) { if ( material.specular !== undefined ) {
materialSpecular.setValue( '#' + material.specular.getHexString() ); materialSpecular.setHexValue( material.specular.getHexString() );
} }
......
editor/js/Sidebar.Object3D.js
浏览文件 @ 8faa50b7
...@@ -541,13 +541,13 @@ Sidebar.Object3D = function ( editor ) { ...@@ -541,13 +541,13 @@ Sidebar.Object3D = function ( editor ) {
if ( object.color !== undefined ) { if ( object.color !== undefined ) {
objectColor.setValue( '#' + object.color.getHexString() ); objectColor.setHexValue( object.color.getHexString() );
} }
if ( object.groundColor !== undefined ) { if ( object.groundColor !== undefined ) {
objectGroundColor.setValue( '#' + object.groundColor.getHexString() ); objectGroundColor.setHexValue( object.groundColor.getHexString() );
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或