Skip to content

blender-fix: fix for debug logs and uninitialized colorValue variable #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sindharta merged 1 commit into from
Apr 28, 2023
Merged

blender-fix: fix for debug logs and uninitialized colorValue variable #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Plugins~/Src/MeshSyncClientBlender/msblenMaterialsExportHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ void msblenMaterialsExportHelper::handleSocketValue(bNodeSocket* socket,
}

if (setColorHandler) {
mu::float4 colorValue;
mu::float4 colorValue = { 0,0,0,0 };

switch (socket->type)
{
Expand Down
4 changes: 2 additions & 2 deletions Plugins~/Src/MeshSyncClientBlender/msblenModifiers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,13 @@ void msblenModifiers::importProperties(std::vector<ms::PropertyInfo> 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<int>(), receivedProp.sourceType));
debug_log(mu::Format("importing: %s: %d %d", receivedProp.name.c_str(), receivedProp.get<int>(), 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;
}

Expand Down
7 changes: 3 additions & 4 deletions Plugins~/Src/MeshSyncClientBlender/msblenUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "msblenUtils.h"

#include "BlenderPyObjects/BlenderPyScene.h"
#include "MeshUtils/muLog.h"

namespace bl = blender;
namespace msblenUtils {
Expand Down Expand Up @@ -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<py::eval_mode::eval_statements>(
statement.c_str());
Expand All @@ -200,5 +201,3 @@ void debug_log(std::string message) {
}
}
#endif

}