Merge pull request #203 from umasteeringgroup/Fix-28RC3

Fix 28 rc3

Author: Jaimi

UMAProject/Assets/UMA/Core/Extensions/DynamicCharacterSystem/Scripts/UMAAssetIndexer.cs

@@ -14,13 +14,6 @@ namespace UMA
     public class UMAAssetIndexer : ScriptableObject, ISerializationCallbackReceiver
 	{
 
-#if UNITY_EDITOR_OR_HELL_FREEZES_OVER
-		[UnityEditor.MenuItem("Assets/Create/UMA/Misc/AssetIndex")]
-		public static void CreateAssetIndex()
-		{
-			UMA.CustomAssetUtility.CreateAsset<UMAAssetIndexer>();
-		}
-#endif
 		#region constants and static strings
 		public static string SortOrder = "Name";
         public static string[] SortOrders = { "Name", "AssetName" };
@@ -107,24 +100,16 @@ public static UMAAssetIndexer Instance
             {
                 if (theIndex == null || theIndexer == null)
                 {
-#if UNITY_EDITOR
                     var st = StartTimer();
                     theIndexer = Resources.Load("AssetIndexer") as UMAAssetIndexer;
-                   // if (theIndex == null)
-                   // {
-                   //     return null;
-                   // }
-                    //theIndexer = theIndex.GetComponent<UMAAssetIndexer>();
                     if (theIndexer == null)
-                    { 
-                        return null;
+                    {
+                        if (Debug.isDebugBuild)
+                        {
+                            Debug.LogError("Unable to load the AssetIndexer. This item is used to index non-asset bundle resources and is required.");
+                        }
                     }
                     StopTimer(st,"Asset index load");
-#else
-                theIndex = GameObject.Instantiate(Resources.Load<GameObject>("AssetIndexer")) as GameObject;
-                theIndex.hideFlags = HideFlags.HideAndDontSave;
-                theIndexer = theIndex.GetComponent<UMAAssetIndexer>();
-#endif
                 }
                 return theIndexer;
             }

UMAProject/Assets/UMA/Core/Scripts/DynamicDNAConverterController.cs

@@ -147,13 +147,13 @@ public float baseScale
 		{
 			get { return _overallModifiers.scale; }
 		}
-
+#if UNITY_EDITOR
 		public void ImportConverterBehaviourData(DynamicDNAConverterBehaviour DCB)
 		{
 			_dnaAsset = DCB.dnaAsset;
 			_overallModifiers.ImportSettings(DCB.overallModifiers);
 		}
-
+#endif
 		public void Prepare()
 		{
 			if (!_prepared)

UMAProject/Assets/UMA/Core/StandardAssets/UMA/Scripts/DNAConverterListTester.cs

@@ -197,11 +197,13 @@ public void UpdateDictionary()
 			//UMA2.8+ call Prepare() on the elements in _dnaConverterList now.
 			for (int i = 0; i < _dnaConverterList.Count; i++)
 			{
+#if UNITY_EDITOR
 				//Do we do update nagging here?
-				if(_dnaConverterList[i] is UMA.CharacterSystem.DynamicDNAConverterBehaviour)
+				if (_dnaConverterList[i] is UMA.CharacterSystem.DynamicDNAConverterBehaviour)
 				{
 					(_dnaConverterList[i] as UMA.CharacterSystem.DynamicDNAConverterBehaviour).DoUpgradeNag(this);
 				}
+#endif
 				_dnaConverterList[i].Prepare();
 			}
 	    }