Merge branch 'master' into leonard

client_Wu Xijin

2018-08-14 31c2cebbccba45a00a755981dd6d0cdd0a0459e9

 Assets/Editor/Tool/UpdateSpritePackingSetting.cs

@@ -97,7 +97,7 @@
                }
                catch (Exception ex)
                {
                    DesignDebug.Log(ex);
                    DebugEx.Log(ex);

                    EditorUtility.ClearProgressBar();
                }
            }