From b113d9db550ab7e475081c394c28f6b85285e212 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 20 Feb 2017 00:32:05 +0100
Subject: [PATCH] Fix incorrect type hierarchy of HermiteCurve, PandaNode,
 ShaderGenerator

---
 panda/src/parametrics/hermiteCurve.h    | 4 +++-
 panda/src/pgraph/pandaNode.h            | 6 ++----
 panda/src/pgraphnodes/shaderGenerator.h | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/panda/src/parametrics/hermiteCurve.h b/panda/src/parametrics/hermiteCurve.h
index 806ab47ff1..5a3d350b82 100644
--- a/panda/src/parametrics/hermiteCurve.h
+++ b/panda/src/parametrics/hermiteCurve.h
@@ -163,7 +163,9 @@ public:
     return _type_handle;
   }
   static void init_type() {
-    register_type(_type_handle, "HermiteCurve");
+    PiecewiseCurve::init_type();
+    register_type(_type_handle, "HermiteCurve",
+                  PiecewiseCurve::get_class_type());
   }
   virtual TypeHandle get_type() const {
     return get_class_type();
diff --git a/panda/src/pgraph/pandaNode.h b/panda/src/pgraph/pandaNode.h
index 0bbc984117..e9f3204ccd 100644
--- a/panda/src/pgraph/pandaNode.h
+++ b/panda/src/pgraph/pandaNode.h
@@ -799,12 +799,10 @@ public:
     return _type_handle;
   }
   static void init_type() {
-    TypedWritable::init_type();
-    ReferenceCount::init_type();
+    TypedWritableReferenceCount::init_type();
     Namable::init_type();
     register_type(_type_handle, "PandaNode",
-                  TypedWritable::get_class_type(),
-                  ReferenceCount::get_class_type(),
+                  TypedWritableReferenceCount::get_class_type(),
                   Namable::get_class_type());
     CData::init_type();
     Down::init_type();
diff --git a/panda/src/pgraphnodes/shaderGenerator.h b/panda/src/pgraphnodes/shaderGenerator.h
index 9564bd6120..a1d83f0919 100644
--- a/panda/src/pgraphnodes/shaderGenerator.h
+++ b/panda/src/pgraphnodes/shaderGenerator.h
@@ -151,9 +151,9 @@ public:
     return _type_handle;
   }
   static void init_type() {
-    TypedObject::init_type();
+    TypedReferenceCount::init_type();
     register_type(_type_handle, "ShaderGenerator",
-                  TypedObject::get_class_type());
+                  TypedReferenceCount::get_class_type());
   }
   virtual TypeHandle get_type() const {
     return get_class_type();
@@ -173,9 +173,9 @@ public:
     return _type_handle;
   }
   static void init_type() {
-    TypedObject::init_type();
+    TypedReferenceCount::init_type();
     register_type(_type_handle, "ShaderGenerator",
-                  TypedObject::get_class_type());
+                  TypedReferenceCount::get_class_type());
   }
   virtual TypeHandle get_type() const {
     return get_class_type();