Merge branch 'master' into release

ZSD-tim · ZSD-tim · commit 8668f0a0af57 · 2020-01-31T21:10:35.000+08:00
diff --git a/scripts/mpdb/scriptEditor.py b/scripts/mpdb/scriptEditor.py
@@ -640,7 +640,7 @@ def enhanceScriptEditor():
         }
     ''')
     cmds.scriptedPanelType( 'scriptEditorPanel', e=1, addCallback='addScriptEditorPanel2' )
-    if cmds.window("scriptEditorPanel1Window",ex=1):
+    if cmds.workspaceControl("scriptEditorPanel1Window",q=1,ex=1):
         # NOTE 关闭当前代码编辑器窗口
         cmds.deleteUI("scriptEditorPanel1Window")
         # NOTE 重新打开一个新的窗口

Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,7 @@ def enhanceScriptEditor():`
`640`	`640`	`}`
`641`	`641`	`''')`
`642`	`642`	`cmds.scriptedPanelType( 'scriptEditorPanel', e=1, addCallback='addScriptEditorPanel2' )`
`643`		`- if cmds.window("scriptEditorPanel1Window",ex=1):`
	`643`	`+ if cmds.workspaceControl("scriptEditorPanel1Window",q=1,ex=1):`
`644`	`644`	`# NOTE 关闭当前代码编辑器窗口`
`645`	`645`	`cmds.deleteUI("scriptEditorPanel1Window")`
`646`	`646`	`# NOTE 重新打开一个新的窗口`