6 files changed, 6 insertions, 28 deletions
diff --git a/core/math/vector3.h b/core/math/vector3.h
index 528c4d37b3..910446023a 100644
--- a/core/math/vector3.h
+++ b/core/math/vector3.h
@@ -44,18 +44,6 @@ struct Vector3 {
 	};
 
 	union {
-
-#ifdef USE_QUAD_VECTORS
-
-		struct {
-			real_t x;
-			real_t y;
-			real_t z;
-			real_t _unused;
-		};
-		real_t coord[4];
-#else
-
 		struct {
 			real_t x;
 			real_t y;
@@ -63,7 +51,6 @@ struct Vector3 {
 		};
 
 		real_t coord[3];
-#endif
 	};
 
 	_FORCE_INLINE_ const real_t& operator[](int p_axis) const {
diff --git a/core/object.h b/core/object.h
index 66619a1dd4..d7b0f09df9 100644
--- a/core/object.h
+++ b/core/object.h
@@ -88,6 +88,7 @@ enum PropertyUsageFlags {
 	PROPERTY_USAGE_RESTART_IF_CHANGED=4096,
 	PROPERTY_USAGE_SCRIPT_VARIABLE=8192,
 	PROPERTY_USAGE_STORE_IF_NULL=16384,
+	PROPERTY_USAGE_ANIMATE_AS_TRIGGER=32768,
 
 	PROPERTY_USAGE_DEFAULT=PROPERTY_USAGE_STORAGE|PROPERTY_USAGE_EDITOR|PROPERTY_USAGE_NETWORK,
 	PROPERTY_USAGE_DEFAULT_INTL=PROPERTY_USAGE_STORAGE|PROPERTY_USAGE_EDITOR|PROPERTY_USAGE_NETWORK|PROPERTY_USAGE_INTERNATIONALIZED,
diff --git a/core/print_string.cpp b/core/print_string.cpp
index 6e57822e94..b6154f1cf6 100644
--- a/core/print_string.cpp
+++ b/core/print_string.cpp
@@ -44,18 +44,15 @@ void add_print_handler(PrintHandlerList *p_handler) {
 
 void remove_print_handler(PrintHandlerList *p_handler) {
 
-	OS::get_singleton()->print("pre-removing print handler...\n");
 	_global_lock();
 
 	PrintHandlerList *prev = NULL;
 	PrintHandlerList *l = print_handler_list;
 
-	OS::get_singleton()->print("removing print handler...\n");
 	while(l) {
 
 		if (l==p_handler) {
 
-			OS::get_singleton()->print("found\n");
 			if (prev)
 				prev->next=l->next;
 			else
diff --git a/core/ustring.h b/core/ustring.h
index 95096e8f76..8aceb0748c 100644
--- a/core/ustring.h
+++ b/core/ustring.h
@@ -46,11 +46,9 @@ public:
 	operator const char*() {return get_data();};
 };
 
-#ifndef CHARTYPE_16BITS
+
 typedef wchar_t CharType;
-#else
-typedef wchar_t uint16_t;
-#endif
+
 
 struct StrRange {
 
diff --git a/core/variant.cpp b/core/variant.cpp
index 472d6cf568..81d10f379a 100644
--- a/core/variant.cpp
+++ b/core/variant.cpp
@@ -1445,12 +1445,12 @@ Variant::operator unsigned char() const {
 
 	return 0;
 }
-#ifndef CHARTYPE_16BITS
+
 Variant::operator CharType() const {
 
 	return operator unsigned int();
 }
-#endif
+
 
 Variant::operator float() const {
 
diff --git a/core/variant.h b/core/variant.h
index b95223ecfb..9c93ecb73b 100644
--- a/core/variant.h
+++ b/core/variant.h
@@ -151,11 +151,7 @@ private:
 		InputEvent *_input_event;
 		Image *_image;
 		void *_ptr; //generic pointer
-#ifdef USE_QUAD_VECTORS
-		uint8_t _mem[sizeof(ObjData) > (sizeof(real_t)*5) ? sizeof(ObjData) : (sizeof(real_t)*5)]; // plane uses an extra real
-#else
 		uint8_t _mem[sizeof(ObjData) > (sizeof(real_t)*4) ? sizeof(ObjData) : (sizeof(real_t)*4)];
-#endif
 	} _data;
 
 
@@ -202,9 +198,8 @@ public:
 	operator unsigned long() const;
 #endif
 
-#ifndef	CHARTYPE_16BITS
+
 	operator CharType() const;
-#endif
 	operator float() const;
 	operator double() const;
 	operator String() const;