summaryrefslogtreecommitdiffstats
path: root/core/variant/variant.h
diff options
context:
space:
mode:
authorAaron Franke <arnfranke@yahoo.com>2021-04-28 03:36:08 -0400
committerAaron Franke <arnfranke@yahoo.com>2021-06-03 07:30:01 -0400
commit08a85352fbf03e392d9fe9ffa2db067d1fea8488 (patch)
tree56b06ff18d3da46b87e074f62fbc35fe1b948eee /core/variant/variant.h
parentde3f6699a5192153e9882a62b58b9ca6cd82ee2d (diff)
downloadredot-engine-08a85352fbf03e392d9fe9ffa2db067d1fea8488.tar.gz
Rename Variant TRANSFORM to TRANSFORM3D
Also _transform to _transform3d
Diffstat (limited to 'core/variant/variant.h')
-rw-r--r--core/variant/variant.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/variant/variant.h b/core/variant/variant.h
index 8cae34d50e..2b41ab5402 100644
--- a/core/variant/variant.h
+++ b/core/variant/variant.h
@@ -91,7 +91,7 @@ public:
QUAT,
AABB,
BASIS,
- TRANSFORM,
+ TRANSFORM3D,
// misc types
COLOR,
@@ -200,7 +200,7 @@ private:
Transform2D *_transform2d;
::AABB *_aabb;
Basis *_basis;
- Transform3D *_transform;
+ Transform3D *_transform3d;
PackedArrayRefBase *packed_array;
void *_ptr; //generic pointer
uint8_t _mem[sizeof(ObjData) > (sizeof(real_t) * 4) ? sizeof(ObjData) : (sizeof(real_t) * 4)];
@@ -322,8 +322,8 @@ public:
operator ::AABB() const;
operator Quat() const;
operator Basis() const;
- operator Transform3D() const;
operator Transform2D() const;
+ operator Transform3D() const;
operator Color() const;
operator NodePath() const;