From 6f21efb679f848a4ba452e0960d9dd06d8dc6f95 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 13 Nov 2006 18:22:25 +0000
Subject: [PATCH] fix compose between 2-d and 3-d mats

---
 panda/src/pgraph/transformState.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panda/src/pgraph/transformState.cxx b/panda/src/pgraph/transformState.cxx
index 3d3014f390..26ec90b78a 100644
--- a/panda/src/pgraph/transformState.cxx
+++ b/panda/src/pgraph/transformState.cxx
@@ -1370,7 +1370,7 @@ do_compose(const TransformState *other) const {
   }
 
   // Do the operation with matrices.
-  if (is_2d()) {
+  if (is_2d() && other->is_2d()) {
     LMatrix3f new_mat = other->get_mat3() * get_mat3();
     return make_mat3(new_mat);
   } else {