Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-24 6ce4ae16561fd205c8bb3f530d5a20033f207f4f

 Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs

@@ -387,6 +387,7 @@
            GUILayout.EndHorizontal();



            EditorGUILayout.Space();

#endif

            GUILayout.BeginHorizontal();

            EditorGUILayout.TextField("SDK Project Path", ClientPackage.SDK_PLUGIN_PROJECT);

            if (GUILayout.Button("Browse", GUILayout.MaxWidth(75f)))

@@ -396,7 +397,6 @@
            GUILayout.EndHorizontal();



            EditorGUILayout.Space();

#endif



            publishers = EditorGUILayout.TextField("Publishers", publishers, GUILayout.Height(50));