Index: cc/animation/transform_operation.cc |
diff --git a/cc/animation/transform_operation.cc b/cc/animation/transform_operation.cc |
index 7421924aedcea56ef9658d47bc2e4c77225404d2..e487921cdb4ba3aa85a0a1054b58811f552c793d 100644 |
--- a/cc/animation/transform_operation.cc |
+++ b/cc/animation/transform_operation.cc |
@@ -41,7 +41,7 @@ static bool ShareSameAxis(const TransformOperation* from, |
if (IsOperationIdentity(from) && IsOperationIdentity(to)) |
return false; |
- if (IsOperationIdentity(from) && !IsOperationIdentity(to)) { |
+ if (!from && !IsOperationIdentity(to)) { |
*axis_x = to->rotate.axis.x; |
*axis_y = to->rotate.axis.y; |
*axis_z = to->rotate.axis.z; |
@@ -49,7 +49,7 @@ static bool ShareSameAxis(const TransformOperation* from, |
return true; |
} |
- if (!IsOperationIdentity(from) && IsOperationIdentity(to)) { |
+ if (!IsOperationIdentity(from) && !to) { |
*axis_x = from->rotate.axis.x; |
*axis_y = from->rotate.axis.y; |
*axis_z = from->rotate.axis.z; |