From a8d3a63c281de1b9c17a5f07cf861e472ee39bb9 Mon Sep 17 00:00:00 2001 From: korenkonder Date: Wed, 5 Jun 2024 23:57:46 +0300 Subject: [PATCH] Fixed crash in Hibana PV --- src/DivaGL/mdl/disp_manager.cpp | 4 ++++ src/DivaGL/mdl/disp_manager.hpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/DivaGL/mdl/disp_manager.cpp b/src/DivaGL/mdl/disp_manager.cpp index 16045fc..b878e0f 100644 --- a/src/DivaGL/mdl/disp_manager.cpp +++ b/src/DivaGL/mdl/disp_manager.cpp @@ -2751,6 +2751,10 @@ namespace mdl { #pragma warning(pop) #endif + bool DispManager::entry_obj_by_object_info(const mat4* mat, object_info obj_info) { + return entry_obj_by_object_info(mat, obj_info, 0, 0, 0, 0, 0, 0, false); + } + bool DispManager::entry_obj_by_object_info(const mat4* mat, object_info obj_info, mat4* bone_mat) { vec4 blend_color = 1.0f; return entry_obj_by_object_info(mat, obj_info, &blend_color, bone_mat, 0, 0, 0, 0, true); diff --git a/src/DivaGL/mdl/disp_manager.hpp b/src/DivaGL/mdl/disp_manager.hpp index e1e4ec0..ad06c8e 100644 --- a/src/DivaGL/mdl/disp_manager.hpp +++ b/src/DivaGL/mdl/disp_manager.hpp @@ -467,7 +467,8 @@ namespace mdl { ::obj* obj, prj::vector* textures, obj_mesh_vertex_buffer_aft* obj_vert_buf, obj_mesh_index_buffer* obj_index_buf, mat4* bone_mat, float_t alpha); #endif - bool entry_obj_by_object_info(const mat4* mat, object_info obj_info, mat4* bone_mat = 0); + bool entry_obj_by_object_info(const mat4* mat, object_info obj_info); + bool entry_obj_by_object_info(const mat4* mat, object_info obj_info, mat4* bone_mat); bool entry_obj_by_object_info(const mat4* mat, object_info obj_info, vec4* blend_color, mat4* bone_mat, int32_t instances_count, mat4* instances_mat, void(*func)(const ObjSubMeshArgs*), const ObjSubMeshArgs* func_data, bool enable_bone_mat, bool local = false);