Merge remote-tracking branch 'origin/gles3' into gles3-on-master

Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)

1 files changed, 5 insertions, 7 deletions

diff --git a/core/rid.cpp b/core/rid.cpp
index 35cd83e786..c7e487f91a 100644
--- a/core/rid.cpp
+++ b/core/rid.cpp
@@ -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();
+}