From 285c14c346ca9ab43a06ffd695d01ab4b86b57ff Mon Sep 17 00:00:00 2001
From: Yoshihiro Yamazaki <yoya@awm.jp>
Date: Fri, 28 Dec 2012 10:32:36 +0900
Subject: [PATCH] =?utf8?q?Define=20=E3=82=BF=E3=82=B0=E3=81=AE=20matrix=20?=
 =?utf8?q?=E3=81=8C=20null=20=E3=81=AE=E6=99=82=E3=81=AE=E5=AF=BE=E5=BF=9C?=
 =?utf8?q?=E3=82=92=E5=85=A5=E3=82=8C=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/movieclip.js | 2 +-
 src/shape.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/movieclip.js b/src/movieclip.js
index 11fd8e5..194c8f7 100644
--- a/src/movieclip.js
+++ b/src/movieclip.js
@@ -44,7 +44,7 @@ FlappMovieClip = function(parentMovieClip, matrix, colorTransform) {
 FlappMovieClip.prototype = {
     setMatrix: function(matrix) {
 	this.matrix = matrix;
-	this.absoluteMatrix = this.parentMovieClip?FlappSWFMatrix.multiply(this.parentMovieClip.absoluteMatrix, matrix):matrix;
+	this.absoluteMatrix = this.parentMovieClip?(matrix?FlappSWFMatrix.multiply(this.parentMovieClip.absoluteMatrix, matrix):this.parentMovieClip.absoluteMatrix):matrix;
     },
     clearControlTags: function() {
         this.controlTagsList = [[]]; //
diff --git a/src/shape.js b/src/shape.js
index 5c41754..293d8cc 100644
--- a/src/shape.js
+++ b/src/shape.js
@@ -26,7 +26,7 @@ FlappShape = function(movieClip, matrix, colorTransform) {
 FlappShape.prototype = {
     setMatrix: function(matrix) {
 	this.matrix = matrix;
-	this.absoluteMatrix = this.movieClip?FlappSWFMatrix.multiply(this.movieClip.absoluteMatrix, matrix):matrix;
+	this.absoluteMatrix = this.movieClip?(matrix?FlappSWFMatrix.multiply(this.movieClip.absoluteMatrix, matrix):this.movieClip.absoluteMatrix):matrix;
     },
     loadShapeTag: function(shape, dict) {
 	var rca = []; // rca
-- 
2.11.0