Skip to content
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.

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

Blender 3.6.2 support #391

Open
wants to merge 46 commits into
base: dev
Choose a base branch
from
Open

Blender 3.6.2 support #391

wants to merge 46 commits into from

Conversation

schinkowski
Copy link
Collaborator

No description provided.

Updating comments.

[skip ci]
… only send them when needed and only send instance infos every udpate.
Export all objects in bpy.data.objects instead of all scene objects to get library objects without instance paths.
schinkowski and others added 16 commits June 21, 2023 15:31
…CCPlugins into chris_working_branch

# Conflicts:
#	Plugins~/Src/MeshSyncClient/Include/MeshSyncClient/msITransformManager.h
#	Plugins~/Src/MeshSyncClient/Include/MeshSyncClient/msInstancesManager.h
#	Plugins~/Src/MeshSyncClientBlender/msblenContext.cpp
#	Plugins~/Src/MeshSyncClientBlender/msblenModifiers.cpp
#	Plugins~/Src/MeshSyncClientBlender/msblenUtils.cpp
#	Readme.md
@@ -46,6 +46,7 @@ with commands described in the following sections.
* Blender 3.2.0 : `-DBUILD_BLENDER_3.2.0_PLUGIN=ON`
* Blender 3.3.0 : `-DBUILD_BLENDER_3.3.0_PLUGIN=ON`
* Blender 3.4.0 : `-DBUILD_BLENDER_3.4.0_PLUGIN=ON`
* Blender 3.5.0 : `-DBUILD_BLENDER_3.5.0_PLUGIN=ON`

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No 3.6.0 here?

Copy link

@gbot-unity gbot-unity left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why we add 2 as a suffix to names across the whole of your changes, other than that seems fine to me.

@@ -15,7 +15,7 @@ namespace blender
void world_matrix(mu::float4x4* world_matrix);
Object* parent();
Object* object();
private:
public:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this an intentional change?

@@ -1589,16 +1664,16 @@ bool msblenContext::sendObjects(MeshSyncClient::ObjectScope scope, bool dirty_al
if (!bpy_data.objects_is_updated())
return true; // nothing to send

scene.each_objects([this](Object *obj) {
for (auto obj : bpy_data.objects()) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Braces are both up and down all over these files 😂

{
for (size_t j = 0; j < sceneList.size(); j++)
{
if (listToFilter[i]->path == sceneList[j]->path)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

C++ is a bit rusty, but comparison here is overloaded so we're not just comparing pointers/whatever right?


auto id = static_cast<ID*>(obj->data);
scene_objects.insert(id->name + 2);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the purpose of this + 2?

auto data = (ID*)obj->data;

path += "_" + std::string(data->name);
path += "_" + std::string(data->name + 2);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again with the +2?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants