archive-gh-me/ShadowEditor
1
0
Fork 0
mirror of https://github.com/tengge1/ShadowEditor.git synced 2026-02-01 16:08:17 +00:00
Code Issues Projects Releases Wiki Activity

修复three.js旧版升级新版引起的问题。

Browse Source
This commit is contained in:
liteng 2018-06-11 12:06:22 +08:00
parent 7aa74326b4
commit a8c2eca88a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/panel/MaterialPanel.js
View File

@ -880,12 +880,12 @@ function MaterialPanel(editor) {
}
if (material.shading !== undefined) {
if (material.flatShading !== undefined) {
var shading = parseInt(materialShading.getValue());
if (material.shading !== shading) {
var flatShading = materialShading.getValue();
if (material.flatShading != flatShading) {
editor.execute(new SetMaterialValueCommand(currentObject, 'shading', shading));
editor.execute(new SetMaterialValueCommand(currentObject, 'flatShading', flatShading, currentMaterialSlot));
}
@ -974,7 +974,7 @@ function MaterialPanel(editor) {
'aoMap': materialAOMapRow,
'emissiveMap': materialEmissiveMapRow,
'side': materialSideRow,
'shading': materialShadingRow,
'flatShading': materialShadingRow,
'blending': materialBlendingRow,
'opacity': materialOpacityRow,
'transparent': materialTransparentRow,
@ -1235,11 +1235,11 @@ function MaterialPanel(editor) {
}
if (material.shading !== undefined) {
if ( material.flatShading !== undefined ) {
materialShading.setValue(material.shading);
materialShading.setValue( material.flatShading );
}
}
if (material.blending !== undefined) {

2
src/ui/Viewport.js
View File

@ -390,7 +390,7 @@ function Viewport(editor) {
if (box.isEmpty() === false) {
selectionBox.update(box);
selectionBox.setFromObject( object );
selectionBox.visible = true;
}