Merge pull request #42 from Live2D/develop

Cubism 4 SDK for Native R5 beta4_1
Live2D · Jul 8, 2022 · f56ba51 · f56ba51
2 parents c498477 + b343252
commit f56ba51
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+
+## [4-r.5-beta.4.1] - 2022-07-08
+
+### Fixed
+
+* Fix Core API called in GetDrawableParentPartIndex function.
+
+
 ## [4-r.5-beta.4] - 2022-07-07
 
 ### Added
@@ -191,6 +199,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Fix invalid expressions of `CubismCdiJson`.
 
 
+[4-r.5-beta.4.1]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.5-beta.4...4-r.5-beta.4.1
 [4-r.5-beta.4]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.5-beta.3...4-r.5-beta.4
 [4-r.5-beta.3]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.5-beta.2...4-r.5-beta.3
 [4-r.5-beta.2]: https://github.com/Live2D/CubismNativeFramework/compare/4-r.5-beta.1...4-r.5-beta.2

diff --git a/src/Model/CubismModel.cpp b/src/Model/CubismModel.cpp
@@ -508,9 +508,9 @@ Core::csmVector4 CubismModel::GetDrawableScreenColor(csmInt32 drawableIndex) con
     return screenColors[drawableIndex];
 }
 
-csmInt32 CubismModel::GetDrawableParentPartIndex(csmUint32 parameterIndex) const
+csmInt32 CubismModel::GetDrawableParentPartIndex(csmUint32 drawableIndex) const
 {
-    return Core::csmGetPartParentPartIndices(_model)[parameterIndex];
+    return Core::csmGetDrawableParentPartIndices(_model)[drawableIndex];
 }
 
 csmInt32 CubismModel::GetDrawableCulling(csmInt32 drawableIndex) const

diff --git a/src/Model/CubismModel.hpp b/src/Model/CubismModel.hpp
@@ -468,9 +468,10 @@ class CubismModel
      *
      * Drawableの親パーツのインデックスを取得する。
      *
+     * @param[in]   drawableIndex   Drawableのインデックス
      * @return drawableの親パーツのインデックス
      */
-    csmInt32 GetDrawableParentPartIndex(csmUint32 parameterIndex) const;
+    csmInt32 GetDrawableParentPartIndex(csmUint32 drawableIndex) const;
 
     /**
      * @brief Drawableのカリング情報の取得