blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Versioning function to replace legacy instancing panel by geometry node modifier #105494

Open
Iliya Katushenock wants to merge 44 commits from mod_moder/blender:instances into main
pull from: mod_moder/blender:instances
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 44 Files Changed 7 +5 -10
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0a715bcc87 - Show all commits

15
source/blender/blenloader/intern/versioning_common.cc
View File

@ -1262,9 +1262,7 @@ static void copy_value_rna_to_id(PropertyRNA &src_prop, PointerRNA &src_ptr, IDP
*reinterpret_cast<bool *>(&IDP_Bool(&dst)) = values;
break;
}
case IDP_UI_DATA_TYPE_UNSUPPORTED:
case IDP_UI_DATA_TYPE_STRING:
case IDP_UI_DATA_TYPE_ID:
case default:
BLI_assert_unreachable();
break;
}
@ -1320,17 +1318,16 @@ static void object_push_instances_modifier(const StringRefNull name,
copy_value_rna_to_id(*obkect_prop, object_ptr, *dst);
std::string rna_path_to_new = "modifiers[\"" + std::string(name) + "\"][\"" +
std::string(socket->identifier) + "\"]";
std::string new_rna_path = "modifiers[\"" + std::string(name) + "\"][\"" +
std::string(socket->identifier) + "\"]";
AnimationBasePathChange animation_to_move;
animation_to_move.src_basepath = legacy_prop_name.data();
animation_to_move.dst_basepath = rna_path_to_new.c_str();
legacy_rna_paths.append(std::move(rna_path_to_new));
animation_to_move.dst_basepath = new_rna_path.c_str();
legacy_rna_paths.append(std::move(new_rna_path));
animation_data_move.append(animation_to_move);
}
ListBase change_list = {nullptr, nullptr};
;
for (AnimationBasePathChange &animation_path : animation_data_move) {
BLI_addtail(&change_list, &animation_path);
}
@ -1396,6 +1393,4 @@ void remove_legacy_instances_on(Main *bmain, ListBase &lb_objects)
parent->transflag = 0;
}
printf("HELLO!\n");
}