Merge "Replace std::string global variables with C-style string." into devel/master
authorDavid Steele <david.steele@samsung.com>
Mon, 20 Feb 2023 15:12:13 +0000 (15:12 +0000)
committerGerrit Code Review <gerrit@review>
Mon, 20 Feb 2023 15:12:13 +0000 (15:12 +0000)
1  2 
dali-scene3d/public-api/loader/gltf2-loader.cpp
dali-scene3d/public-api/loader/mesh-definition.cpp

@@@ -1027,10 -1020,10 +1027,10 @@@ float LoadBlendShapeKeyFrames(Conversio
    Vector<float> inputDataBuffer;
    Vector<float> outputDataBuffer;
  
 -  const float duration = LoadDataFromAccessors<float>(context, input, output, inputDataBuffer, outputDataBuffer);
 +  const float duration = std::max(LoadDataFromAccessors<float>(context, input, output, inputDataBuffer, outputDataBuffer), AnimationDefinition::MIN_DURATION_SECONDS);
  
    char        weightNameBuffer[32];
-   auto        prefixSize    = snprintf(weightNameBuffer, sizeof(weightNameBuffer), "%s[", BLEND_SHAPE_WEIGHTS_UNIFORM.c_str());
+   auto        prefixSize    = snprintf(weightNameBuffer, sizeof(weightNameBuffer), "%s[", BLEND_SHAPE_WEIGHTS_UNIFORM);
    char* const pWeightName   = weightNameBuffer + prefixSize;
    const auto  remainingSize = sizeof(weightNameBuffer) - prefixSize;
    for(uint32_t weightIndex = 0u, endWeightIndex = channel.mSampler->mOutput->mCount / channel.mSampler->mInput->mCount; weightIndex < endWeightIndex; ++weightIndex)