Merge pull request #32 from Kapim/master

fix: context menus were not working
robofit · Mar 24, 2020 · dca5529 · dca5529
2 parents b27a52a + d246b56
commit dca5529
Show file tree

Hide file tree

Showing 4 changed files with 2,365 additions and 2,309 deletions.
diff --git a/arcor2_AREditor/Assets/TABLET/Prefabs/ProjectTile.prefab b/arcor2_AREditor/Assets/TABLET/Prefabs/ProjectTile.prefab
@@ -13,8 +13,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Label: {fileID: 4567353453605356397}
-  MainButton: {fileID: 4567353453841392387}
-  OptionButton: {fileID: 4567353452674148738}
+  MainButton: {fileID: 9094245238966222363}
+  OptionButton: {fileID: 4318907418865586597}
   star: {fileID: 2104712010368211220}
 --- !u!1001 &8217384714284741153
 PrefabInstance:
@@ -141,9 +141,9 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 8217384714284741153}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &4567353453841392387 stripped
+--- !u!114 &9094245238966222363 stripped
 MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5577844582604083490, guid: e3a3e61aa1e8c804a9a7034839f1cc61,
+  m_CorrespondingSourceObject: {fileID: 882490025461468218, guid: e3a3e61aa1e8c804a9a7034839f1cc61,
     type: 3}
   m_PrefabInstance: {fileID: 8217384714284741153}
   m_PrefabAsset: {fileID: 0}
@@ -153,18 +153,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &4567353452674148738 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5577844581084519331, guid: e3a3e61aa1e8c804a9a7034839f1cc61,
-    type: 3}
-  m_PrefabInstance: {fileID: 8217384714284741153}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &4567353453605356397 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61,
@@ -183,3 +171,15 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 8217384714284741153}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &4318907418865586597 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5324896013035692932, guid: e3a3e61aa1e8c804a9a7034839f1cc61,
+    type: 3}
+  m_PrefabInstance: {fileID: 8217384714284741153}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
diff --git a/arcor2_AREditor/Assets/TABLET/Prefabs/SceneTile.prefab b/arcor2_AREditor/Assets/TABLET/Prefabs/SceneTile.prefab
@@ -13,8 +13,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Label: {fileID: 5953975446855075595}
-  MainButton: {fileID: 5953975446484969317}
-  OptionButton: {fileID: 5953975448021446116}
+  MainButton: {fileID: 1438764873128524413}
+  OptionButton: {fileID: 6209740071507367363}
   star: {fileID: 8140197742690573682}
 --- !u!1001 &2290283853980792391
 PrefabInstance:
@@ -86,9 +86,9 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 2290283853980792391}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &5953975446484969317 stripped
+--- !u!114 &1438764873128524413 stripped
 MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5577844582604083490, guid: e3a3e61aa1e8c804a9a7034839f1cc61,
+  m_CorrespondingSourceObject: {fileID: 882490025461468218, guid: e3a3e61aa1e8c804a9a7034839f1cc61,
     type: 3}
   m_PrefabInstance: {fileID: 2290283853980792391}
   m_PrefabAsset: {fileID: 0}
@@ -98,18 +98,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &5953975448021446116 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5577844581084519331, guid: e3a3e61aa1e8c804a9a7034839f1cc61,
-    type: 3}
-  m_PrefabInstance: {fileID: 2290283853980792391}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &5953975446855075595 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61,
@@ -128,3 +116,15 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 2290283853980792391}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &6209740071507367363 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5324896013035692932, guid: e3a3e61aa1e8c804a9a7034839f1cc61,
+    type: 3}
+  m_PrefabInstance: {fileID: 2290283853980792391}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: