From 45e1f4d25ef736f025fafe535c7451ae6da07924 Mon Sep 17 00:00:00 2001
From: Mitchell Stokes <mogurijin@gmail.com>
Date: Tue, 6 Oct 2015 20:41:16 -0700
Subject: [PATCH] Assimp: Cleanup skeletal mesh code.

  * Use pmap instead of phash_map
  * Remove PT() in create_joint() function header
---
 pandatool/src/assimp/assimpLoader.cxx | 2 +-
 pandatool/src/assimp/assimpLoader.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pandatool/src/assimp/assimpLoader.cxx b/pandatool/src/assimp/assimpLoader.cxx
index 258e160c77..f0322dc506 100644
--- a/pandatool/src/assimp/assimpLoader.cxx
+++ b/pandatool/src/assimp/assimpLoader.cxx
@@ -418,7 +418,7 @@ load_material(size_t index) {
 //  Description: Creates a CharacterJoint from an aiNode
 ////////////////////////////////////////////////////////////////////
 void AssimpLoader::
-create_joint(PT(Character) character, PT(CharacterJointBundle) bundle, PartGroup *parent, const aiNode &node)
+create_joint(Character *character, CharacterJointBundle *bundle, PartGroup *parent, const aiNode &node)
 {
   const aiMatrix4x4 &t = node.mTransformation;
   LMatrix4 mat(t.a1, t.b1, t.c1, t.d1,
diff --git a/pandatool/src/assimp/assimpLoader.h b/pandatool/src/assimp/assimpLoader.h
index 851ccc3a24..f9544d2ed5 100644
--- a/pandatool/src/assimp/assimpLoader.h
+++ b/pandatool/src/assimp/assimpLoader.h
@@ -33,8 +33,8 @@ struct char_cmp {
     return strcmp(a,b) < 0;
   }
 };
-typedef phash_map<const char *, const aiNode *, char_cmp> BoneMap;
-typedef phash_map<const char *, PT(Character), char_cmp> CharacterMap;
+typedef pmap<const char *, const aiNode *, char_cmp> BoneMap;
+typedef pmap<const char *, PT(Character), char_cmp> CharacterMap;
 
 ////////////////////////////////////////////////////////////////////
 //       Class : AssimpLoader
@@ -75,7 +75,7 @@ private:
   void load_texture(size_t index);
   void load_texture_stage(const aiMaterial &mat, const aiTextureType &ttype, CPT(TextureAttrib) &tattr);
   void load_material(size_t index);
-  void create_joint(PT(Character) character, PT(CharacterJointBundle) bundle, PartGroup *parent, const aiNode &node);
+  void create_joint(Character *character, CharacterJointBundle *bundle, PartGroup *parent, const aiNode &node);
   void load_mesh(size_t index);
   void load_node(const aiNode &node, PandaNode *parent);
   void load_light(const aiLight &light);