From 73baa84e958eaa8eb1baef983decaabf4a0007b7 Mon Sep 17 00:00:00 2001
From: korenkonder <admin@mysterious-home.net>
Date: Fri, 27 Feb 2026 19:46:44 +0300
Subject: [PATCH] ...

---
 src/CRE/object.cpp         | 7 +++++++
 src/CRE/object.hpp         | 1 +
 src/CRE/rob/skin_param.cpp | 5 ++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/CRE/object.cpp b/src/CRE/object.cpp
index 392af473..25224333 100644
--- a/src/CRE/object.cpp
+++ b/src/CRE/object.cpp
@@ -1977,6 +1977,13 @@ inline obj_skin* objset_info_storage_get_obj_skin(object_info obj_info) {
     return 0;
 }
 
+inline obj_skin_ex_data* objset_info_storage_get_obj_skin_ex_data(object_info obj_info) {
+    obj_skin* skin = objset_info_storage_get_obj_skin(obj_info);
+    if (skin)
+        return skin->ex_data;
+    return 0;
+}
+
 inline obj_index_buffer* objset_info_storage_get_obj_index_buffers(uint32_t set_id) {
     ObjsetInfo* info = objset_info_storage_get_objset_info(set_id);
     if (info && info->objib)
diff --git a/src/CRE/object.hpp b/src/CRE/object.hpp
index fb03e727..b697a531 100644
--- a/src/CRE/object.hpp
+++ b/src/CRE/object.hpp
@@ -136,6 +136,7 @@ extern obj_set* objset_info_storage_get_obj_set(uint32_t set_id);
 extern size_t objset_info_storage_get_obj_set_count();
 extern int32_t objset_info_storage_get_obj_storage_load_count(uint32_t set_id);
 extern obj_skin* objset_info_storage_get_obj_skin(object_info obj_info);
+extern obj_skin_ex_data* objset_info_storage_get_obj_skin_ex_data(object_info obj_info);
 extern obj_index_buffer* objset_info_storage_get_obj_index_buffers(uint32_t set_id);
 extern obj_mesh_index_buffer* objset_info_storage_get_obj_mesh_index_buffer(object_info obj_info);
 extern obj_vertex_buffer* objset_info_storage_get_obj_vertex_buffers(uint32_t set_id);
diff --git a/src/CRE/rob/skin_param.cpp b/src/CRE/rob/skin_param.cpp
index 47935f52..60fc48c1 100644
--- a/src/CRE/rob/skin_param.cpp
+++ b/src/CRE/rob/skin_param.cpp
@@ -793,11 +793,10 @@ void SkinParamManager::AddFiles() {
             if (!obj_name)
                 continue;
 
-            obj_skin* skin = objset_info_storage_get_obj_skin(obj_info);
-            if (!skin || !skin->ex_data)
+            obj_skin_ex_data* ex_data = objset_info_storage_get_obj_skin_ex_data(obj_info);
+            if (!ex_data)
                 continue;
 
-            obj_skin_ex_data* ex_data = skin->ex_data;
             int32_t osage_count = 0;
             int32_t cloth_count = 0;