@@ -22,13 +22,15 @@ Description: MMD model object
2222#include " mmd_mesh_manager.h"
2323#include " mmd_rigid_manager.h"
2424#include " customgui_priority.h"
25+ #include " description/OMMDModelManager.h"
2526#include " description/OMMDRigid.h"
2627#include " description/TMMDBone.h"
2728#include " maxon/queue.h"
2829#include " utils/filename_util.hpp"
2930#include " utils/string_util.hpp"
3031#include " libMMD/Model/MMD/MMDPhysics.h"
3132#include " libMMD/Model/MMD/SjisToUnicode.h"
33+ #include " module/core/cmt_debug_log.h"
3234#include < btBulletDynamicsCommon.h>
3335
3436#include < algorithm>
@@ -88,14 +90,14 @@ namespace
8890
8991 GeData data;
9092 const Int32 param_id = use_local_name ? PMX_BONE_NAME_LOCAL : PMX_BONE_NAME_UNIVERSAL;
91- if (tag-> GetParameter ( CreateDescID (DescLevel (param_id)), data, DESCFLAGS_GET::NONE))
93+ if (GetAtomParameter (tag, CreateDescID (DescLevel (param_id)), data, DESCFLAGS_GET::NONE))
9294 {
9395 const String name = data.GetString ();
9496 if (!name.IsEmpty ())
9597 return name;
9698 }
9799
98- if (const BaseObject* object = tag->GetObject ())
100+ if (BaseObject* object = const_cast <BaseTag*>( tag) ->GetObject ())
99101 return object->GetName ();
100102
101103 return " " _s;
@@ -326,7 +328,7 @@ namespace
326328 if (!rigid_manager_object || bone_index < 0 )
327329 return false ;
328330
329- for (const BaseObject* child = rigid_manager_object->GetDown (); child; child = child->GetNext ())
331+ for (BaseObject* child = const_cast <BaseObject*>( rigid_manager_object) ->GetDown (); child; child = child->GetNext ())
330332 {
331333 if (!child->IsInstanceOf (g_mmd_rigid_object_id))
332334 continue ;
@@ -1935,7 +1937,7 @@ Bool MMDModelManagerObject::BuildStandaloneBoneAdapters()
19351937 Int32 priority = 0 ;
19361938 if (GeData priority_data; bone_tag->GetParameter (ConstDescID (DescLevel (EXPRESSION_PRIORITY)), priority_data, DESCFLAGS_GET::NONE))
19371939 {
1938- if (const auto * const pd = priority_data. GetCustomDataType <PriorityData>())
1940+ if (const auto * const pd = GetCustomDataTypeWritable <PriorityData>(priority_data, CUSTOMGUI_PRIORITY_DATA ))
19391941 priority = pd->GetPriorityValue (PRIORITYVALUE_PRIORITY).GetInt32 ();
19401942 }
19411943 max_bone_priority = std::max (max_bone_priority, priority);
0 commit comments