From 95047562d743b1c1fdc007432c8a0c145a455c5d Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Mon, 29 Jun 2015 00:29:49 -0300
Subject: Several performance improvements, mainly in loading and instancing
 scenes and resources. A general speedup should be apparent, with even more
 peformance increase when compiling optimized.

WARNING: Tested and it seems to work, but if something breaks, please report.
---
 core/object.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'core/object.cpp')

diff --git a/core/object.cpp b/core/object.cpp
index 6bb7973cef..07ac430d7a 100644
--- a/core/object.cpp
+++ b/core/object.cpp
@@ -258,12 +258,15 @@ bool Object::_predelete() {
 	
 	_predelete_ok=1;
 	notification(NOTIFICATION_PREDELETE,true);
+	if (_predelete_ok) {
+		_type_ptr=NULL; //must restore so destructors can access type ptr correctly
+	}
 	return _predelete_ok;
 
 }
 
 void Object::_postinitialize() {
-	
+	_type_ptr=_get_type_namev();
 	_initialize_typev();
 	notification(NOTIFICATION_POSTINITIALIZE);
 	
@@ -1707,7 +1710,7 @@ bool Object::is_edited() const {
 
 Object::Object() {
 	
-
+	_type_ptr=NULL;
 	_block_signals=false;
 	_predelete_ok=0;
 	_instance_ID=0;
-- 
cgit v1.2.3