Merge pull request #52 from Unity-Technologies/UNI-21917-gameobject-menu-bug

vkovec · web-flow · commit 78d78fc64824 · 2017-07-24T14:09:11.000-04:00
UNI-21917 - fix 'convert to model' in GameObject menu
diff --git a/Assets/FbxExporters/Editor/ConvertToModel.cs b/Assets/FbxExporters/Editor/ConvertToModel.cs
@@ -54,9 +54,12 @@ public static bool OnValidateMenuItem ()
             static void OnContextItem (MenuCommand command)
             {
                 if (command == null || command.context == null) {
-                    Debug.LogError ("Error: No GameObject selected");
+                    // We were actually invoked from the top GameObject menu,
+                    // not the context menu, so treat it as such.
+                    OnMenuItem();
                     return;
                 }
+
                 GameObject selected = command.context as GameObject;
                 if (selected == null) {
                     Debug.LogError (string.Format("Error: {0} is not a GameObject and cannot be converted", command.context.name));

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,12 @@ public static bool OnValidateMenuItem ()`
`54`	`54`	`static void OnContextItem (MenuCommand command)`
`55`	`55`	`{`
`56`	`56`	`if (command == null \|\| command.context == null) {`
`57`		`- Debug.LogError ("Error: No GameObject selected");`
	`57`	`+ // We were actually invoked from the top GameObject menu,`
	`58`	`+ // not the context menu, so treat it as such.`
	`59`	`+ OnMenuItem();`
`58`	`60`	`return;`
`59`	`61`	`}`
	`62`	`+`
`60`	`63`	`GameObject selected = command.context as GameObject;`
`61`	`64`	`if (selected == null) {`
`62`	`65`	`Debug.LogError (string.Format("Error: {0} is not a GameObject and cannot be converted", command.context.name));`