Change private->public spec for error checking in mjCSkin recompilation.
Fixes #2485. PiperOrigin-RevId: 735323174 Change-Id: Ifcc2055f6a74afaa18ad5228633f36f760adcffd
This commit is contained in:
committed by
Copybara-Service
parent
4d024f9421
commit
adc3cc06fa
+9
-10
@@ -2526,16 +2526,15 @@ void mjCSkin::Compile(const mjVFS* vfs) {
|
||||
// load file
|
||||
if (!file_.empty()) {
|
||||
// make sure data is not present
|
||||
if (!vert_.empty() ||
|
||||
!texcoord_.empty() ||
|
||||
!face_.empty() ||
|
||||
!bodyname_.empty() ||
|
||||
!bindpos_.empty() ||
|
||||
!bindquat_.empty() ||
|
||||
!vertid_.empty() ||
|
||||
!vertweight_.empty() ||
|
||||
!bodyid.empty()) {
|
||||
throw mjCError(this, "Data already exists, trying to load from skin file: %s", file_.c_str());
|
||||
if (!spec_vert_.empty() ||
|
||||
!spec_texcoord_.empty() ||
|
||||
!spec_face_.empty() ||
|
||||
!spec_bodyname_.empty() ||
|
||||
!spec_bindpos_.empty() ||
|
||||
!spec_bindquat_.empty() ||
|
||||
!spec_vertid_.empty() ||
|
||||
!spec_vertweight_.empty()) {
|
||||
throw mjCError(this, "Both skin data and file were specified: %s", file_.c_str());
|
||||
}
|
||||
|
||||
// remove path from file if necessary
|
||||
|
||||
Reference in New Issue
Block a user