Merge pull request #58 from Unity-Technologies/dev

Dev
Unity-Technologies · Dec 11, 2017 · a223b0b · a223b0b
2 parents 3f694ae + b4fba50
commit a223b0b
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 5 deletions.
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,6 @@
+Documentation/ApiDocs/**
+.npmrc
+.npmignore
+.gitignore
+QAReport.md
+QAReport.md.meta
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [1.1.4] - 2017-11-09
+## [1.2.0] - 2017-12-08
+- Added asmdef to keep browser in its own assembly
+- minor null check fixes
 
+## [1.1.4] - 2017-11-09
 - Initial submission for package distribution
diff --git a/Documentation/com.unity.assetbundlebrowser.md b/Documentation/com.unity.assetbundlebrowser.md
@@ -4,7 +4,7 @@ This tool enables the user to view and edit the configuration of asset bundles f
 
 Use this tool as an alternative to selecting assets and setting their asset bundle manually in the inspector. It can be dropped into any Unity project with a version of 5.6 or greater. It will create a new menu item in __Window__ > __AssetBundle Browser__. The bundle configuration, build functionality, and build-bundle inspection are split into three tabs within the new window.
 
-![BrowserHeader](/Documentation/images/browser_header.png)
+![BrowserHeader](../Documentation/images/browser_header.png)
 
 ### Requires Unity 5.6+
 
@@ -13,7 +13,7 @@ Use this tool as an alternative to selecting assets and setting their asset bund
 This window provides an explorer like interface to managing and modifying asset bundles in your project. When first opened, the tool will parse all bundle data in the background, slowly marking warnings or errors it detects. It does what it can to stay in sync with the project, but cannot always be aware of activity outside the tool. To force a quick pass at error detection, or to update the tool with changes made externally, hit the Refresh button in the upper left.
 
 The window is broken into four sections: Bundle List, Bundle Details, Asset List, and Asset Details. 
-![BroserConfigure](/Documentation/images/browser_configure2.png)
+![BroserConfigure](../Documentation/images/browser_configure2.png)
 
 ### Bundle List
 

diff --git a/Editor/AssetListTree.cs b/Editor/AssetListTree.cs
@@ -150,7 +150,8 @@ private void CellGUI(Rect cellRect, AssetBundleModel.AssetTreeItem item, int col
                 case 0:
                     {
                         var iconRect = new Rect(cellRect.x + 1, cellRect.y + 1, cellRect.height - 2, cellRect.height - 2);
-                        GUI.DrawTexture(iconRect, item.icon, ScaleMode.ScaleToFit);
+                        if(item.icon != null)
+                            GUI.DrawTexture(iconRect, item.icon, ScaleMode.ScaleToFit);
                         DefaultGUI.Label(
                             new Rect(cellRect.x + iconRect.xMax + 1, cellRect.y, cellRect.width - iconRect.width, cellRect.height), 
                             item.displayName, 

diff --git a/Editor/com.unity.assetbundlebrowser.Editor.asmdef b/Editor/com.unity.assetbundlebrowser.Editor.asmdef
@@ -0,0 +1,9 @@
+{
+    "name": "com.unity.assetbundlebrowser.Editor",
+    "references": [
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": []
+}
diff --git a/Editor/com.unity.assetbundlebrowser.Editor.asmdef.meta b/Editor/com.unity.assetbundlebrowser.Editor.asmdef.meta
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "com.unity.assetbundlebrowser",
-	"version": "1.1.4",
+	"version": "1.2.0",
 	"unity": "2018.1",
 	"description": "Editor tool used to manually manage Asset Bundle configuration.",
 	"keywords": ["asset", "bundle", "bundles", "assetbundles"],