Merge branch 'compositor' of https://github.com/mbebenita/shumway int…

…o compositor
mozilla · Mar 18, 2014 · eaff150 · eaff150
2 parents aa794c9 + 760dd30
commit eaff150
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/flash/display/DisplayObject.js b/src/flash/display/DisplayObject.js
@@ -474,8 +474,12 @@ var DisplayObjectDefinition = (function () {
       message.writeIntUnsafe(blendModes.indexOf(this._blendMode));
 
       if (this._mask) {
-        message.writeIntUnsafe(this._mask._layerId);
-        message.writeIntUnsafe(false);
+        if (this._maskedObject) {
+          message.writeIntUnsafe(0);
+        } else {
+          message.writeIntUnsafe(this._mask._layerId);
+          message.writeIntUnsafe(false);
+        }
       } else if (this._clip) {
         message.writeIntUnsafe(this._clip._layerId);
         message.writeIntUnsafe(true);