Merge remote-tracking branch 'origin/dev'

Chenguang Liu · Chenguang Liu · commit 4a66e16cc5a5 · 2013-06-20T19:24:30.000+08:00
diff --git a/src/dragonBones/display/StarlingDisplayBridge.as b/src/dragonBones/display/StarlingDisplayBridge.as
@@ -45,7 +45,8 @@
 			}
 			
 			//Thanks Jian
-			if (_display is Image && value is Image)
+			//bug replace image.texture will lost displayList[0].texture
+			/*if (_display is Image && value is Image)
 			{
 				var from:Image = _display as Image;
 				var to:Image = value as Image;
@@ -60,7 +61,7 @@
 				from.pivotY = to.pivotY;
 				from.readjustSize();
 				return;
-			}
+			}*/
 			
 			if (_display)
 			{

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`//Thanks Jian`
`48`		`- if (_display is Image && value is Image)`
	`48`	`+ //bug replace image.texture will lost displayList[0].texture`
	`49`	`+ /*if (_display is Image && value is Image)`
`49`	`50`	`{`
`50`	`51`	`var from:Image = _display as Image;`
`51`	`52`	`var to:Image = value as Image;`
`@@ -60,7 +61,7 @@`
`60`	`61`	`from.pivotY = to.pivotY;`
`61`	`62`	`from.readjustSize();`
`62`	`63`	`return;`
`63`		`- }`
	`64`	`+ }*/`
`64`	`65`
`65`	`66`	`if (_display)`
`66`	`67`	`{`