diff --git a/Plugins~/Src/MeshSyncClientBlender/msblenMaterialsExportHelper.cpp b/Plugins~/Src/MeshSyncClientBlender/msblenMaterialsExportHelper.cpp index 76399b1e..fa061c23 100644 --- a/Plugins~/Src/MeshSyncClientBlender/msblenMaterialsExportHelper.cpp +++ b/Plugins~/Src/MeshSyncClientBlender/msblenMaterialsExportHelper.cpp @@ -331,7 +331,7 @@ void msblenMaterialsExportHelper::handleSocketValue(bNodeSocket* socket, } if (setColorHandler) { - mu::float4 colorValue; + mu::float4 colorValue = { 0,0,0,0 }; switch (socket->type) { diff --git a/Plugins~/Src/MeshSyncClientBlender/msblenModifiers.cpp b/Plugins~/Src/MeshSyncClientBlender/msblenModifiers.cpp index 39467c50..bf754e82 100644 --- a/Plugins~/Src/MeshSyncClientBlender/msblenModifiers.cpp +++ b/Plugins~/Src/MeshSyncClientBlender/msblenModifiers.cpp @@ -310,13 +310,13 @@ void msblenModifiers::importProperties(std::vector props) { // Apply returned properties: for (auto& receivedProp : props) { if (receivedProp.type == ms::PropertyInfo::Type::Int) - debug_log(Format("importing: %s: %d %d", receivedProp.name.c_str(), receivedProp.get(), receivedProp.sourceType)); + debug_log(mu::Format("importing: %s: %d %d", receivedProp.name.c_str(), receivedProp.get(), receivedProp.sourceType)); auto obj = msblenUtils::get_object_from_path(receivedProp.path); // Should never happen but just in case: if (!obj) { - debug_log(Format("cannot find object: %s", receivedProp.path.c_str())); + debug_log(mu::Format("cannot find object: %s", receivedProp.path.c_str())); continue; } diff --git a/Plugins~/Src/MeshSyncClientBlender/msblenUtils.cpp b/Plugins~/Src/MeshSyncClientBlender/msblenUtils.cpp index 817908ce..be0c9145 100644 --- a/Plugins~/Src/MeshSyncClientBlender/msblenUtils.cpp +++ b/Plugins~/Src/MeshSyncClientBlender/msblenUtils.cpp @@ -4,6 +4,7 @@ #include "msblenUtils.h" #include "BlenderPyObjects/BlenderPyScene.h" +#include "MeshUtils/muLog.h" namespace bl = blender; namespace msblenUtils { @@ -181,14 +182,14 @@ bool is_mesh(const Object *obj) { return obj->type == OB_MESH; } bool is_camera(const Object *obj) { return obj->type == OB_CAMERA; } bool is_light(const Object *obj) { return obj->type == OB_LAMP; } bool is_armature(const Object *obj) { return obj->type == OB_ARMATURE; } - +} #ifdef BLENDER_DEBUG_LOGS void debug_log(std::string message) { try { py::gil_scoped_acquire acquire; - auto statement = Format("print('%s')", message.c_str()); + auto statement = mu::Format("print('%s')", message.c_str()); py::eval( statement.c_str()); @@ -200,5 +201,3 @@ void debug_log(std::string message) { } } #endif - -}