1 files changed, 6 insertions, 8 deletions

diff --git a/core/rid.cpp b/core/rid.cpp
index 219c2f0e6..c7e487f91 100644
--- a/core/rid.cpp
+++ b/core/rid.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -28,18 +28,16 @@
 /*************************************************************************/
 #include "rid.h"
 
-static SafeRefCount current_id;
 
 
-void RID_OwnerBase::init_rid() {
+RID_Data::~RID_Data() {
 
-	current_id.init(1);
 }
 
-ID RID_OwnerBase::new_ID() {
 
+SafeRefCount RID_OwnerBase::refcount;
 
-	ID id = current_id.refval();
-	return id;
-}
+void RID_OwnerBase::init_rid() {
 
+	refcount.init();
+}