Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162

2020-09-16 21:43:35 +02:00
parent bd91033172 3e5feb4320
commit 338c0b753c
82 changed files with 577 additions and 399 deletions
@@ -1251,7 +1251,7 @@ void ColladaLoader::CreateAnimation(aiScene *pScene, const ColladaParser &pParse

            // time count and value count must match
            if (e.mTimeAccessor->mCount != e.mValueAccessor->mCount)
-                throw DeadlyImportError(format() << "Time count / value count mismatch in animation channel \"" << e.mChannel->mTarget << "\".");
+                throw DeadlyImportError("Time count / value count mismatch in animation channel \"", e.mChannel->mTarget, "\".");

            if (e.mTimeAccessor->mCount > 0) {
                // find bounding times