minor update for animators

awaytools · Jun 19, 2013 · f401a89 · f401a89
1 parent abad571
commit f401a89
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/awaybuilder-core/src/awaybuilder/model/SmartFactoryModelBase.as b/awaybuilder-core/src/awaybuilder/model/SmartFactoryModelBase.as
@@ -911,6 +911,18 @@ package awaybuilder.model
 				}
 				asset.subMeshes.addItem( sm );
 			}
+
+			// animators loaded not from animationSet, so animationSets know nothing about them directly
+			if( asset.animator )
+			{
+				var alreadyAdded:Boolean = false;
+				for each( var animator:AnimatorVO in asset.animator.animationSet.animators )
+				{
+					if( animator.equals( asset.animator ) ) alreadyAdded = true;	
+				}
+				if( !alreadyAdded )	asset.animator.animationSet.animators.addItem( asset.animator );
+			}
+
 			return asset;
 		}
 		private function fillContainer( asset:ContainerVO, item:ObjectContainer3D ):ContainerVO

diff --git a/awaybuilder-core/src/awaybuilder/view/components/controls/tree/SceneDataDescriptor.as b/awaybuilder-core/src/awaybuilder/view/components/controls/tree/SceneDataDescriptor.as
@@ -44,7 +44,6 @@ package awaybuilder.view.components.controls.tree
 					var children:ArrayCollection = ChildCollectionCache[node];
 					if( !children )
 					{
-						trace( "createChildren for " + node );
 						children = new ArrayCollection();
 						ChildCollectionCache[node] = children;
 					}

diff --git a/awaybuilder-core/src/awaybuilder/view/components/editors/MaterialPropertiesEditor.mxml b/awaybuilder-core/src/awaybuilder/view/components/editors/MaterialPropertiesEditor.mxml
@@ -212,9 +212,6 @@
 			
 			_shadowMethods = new ArrayCollection(shadowMehtods);
 			
-			trace( "_shadowMethods", _shadowMethods );
-			
-			
 			if( _asset.shadowMethod && _asset.light && _asset.lightPicker )
 			{
 				for each(var method:AssetVO in _shadowMethods ) 
@@ -226,10 +223,6 @@
 			{
 				_selectedShadowMethod = _shadowMethods.getItemAt(0) as AssetVO;
 			}
-			trace( "_selectedShadowMethod", _selectedShadowMethod );
-			
-//			trace("shadowLightDropDownList.selectedItem ", shadowLightDropDownList.selectedItem );
-			
 		}
 		
 		private function shadowMethodDropDownList_changeHandler(event:IndexChangeEvent):void