griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Readfile: Replace the 'expand' specific code by generic usage of foreach_id.

Browse Source 
The `expand` callback is 'trivial' to replace, since it is only iterating
over ID pointers and calling a callback.

The only change in behavior here is that some pointers that were not
processed previously will now be.

In practice this is not expected to have any real effect (usually
the IDs used by these pointers would have been expanded through other
usages anyway). But it may solve a few corner cases, undocumented issues
though.

Part of implementing #105134: Removal of readfile's lib_link & expand code.
This commit is contained in:
Bastien Montagne
2023-08-23 12:36:56 +02:00
parent c79642fa98
commit 8bb5916183
63 changed files with 43 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
source/blender/blenkernel/intern/node_tree_interface.cc
View File

@@ -376,42 +376,6 @@ static void socket_data_read_lib(BlendLibReader *reader, ID *id, bNodeTreeInterf
/** \} */
/* -------------------------------------------------------------------- */
/** \name Expand Socket Data
* \{ */
template<typename T> void socket_data_expand_impl(BlendExpander * /*expander*/, T & /*data*/) {}
template<> void socket_data_expand_impl(BlendExpander *expander, bNodeSocketValueObject &data)
{
BLO_expand(expander, &data.value);
}
template<> void socket_data_expand_impl(BlendExpander *expander, bNodeSocketValueImage &data)
{
BLO_expand(expander, &data.value);
}
template<> void socket_data_expand_impl(BlendExpander *expander, bNodeSocketValueCollection &data)
{
BLO_expand(expander, &data.value);
}
template<> void socket_data_expand_impl(BlendExpander *expander, bNodeSocketValueTexture &data)
{
BLO_expand(expander, &data.value);
}
template<> void socket_data_expand_impl(BlendExpander *expander, bNodeSocketValueMaterial &data)
{
BLO_expand(expander, &data.value);
}
static void socket_data_expand(BlendExpander *expander, bNodeTreeInterfaceSocket &socket)
{
socket_data_to_static_type_tag(socket.socket_type, [&](auto type_tag) {
using SocketDataType = typename decltype(type_tag)::type;
socket_data_expand_impl(expander, get_socket_data_as<SocketDataType>(socket));
});
}
/** \} */
/* -------------------------------------------------------------------- */
/** \name Callback per ID Pointer
* \{ */
@@ -624,25 +588,6 @@ static void item_read_lib(BlendLibReader *reader, ID *id, bNodeTreeInterfaceItem
}
}
static void item_read_expand(BlendExpander *expander, bNodeTreeInterfaceItem &item)
{
switch (item.item_type) {
case NODE_INTERFACE_SOCKET: {
bNodeTreeInterfaceSocket &socket = reinterpret_cast<bNodeTreeInterfaceSocket &>(item);
IDP_BlendReadExpand(expander, socket.properties);
socket_types::socket_data_expand(expander, socket);
break;
}
case NODE_INTERFACE_PANEL: {
bNodeTreeInterfacePanel &panel = reinterpret_cast<bNodeTreeInterfacePanel &>(item);
for (bNodeTreeInterfaceItem *item : panel.items()) {
item_read_expand(expander, *item);
}
break;
}
}
}
static void item_foreach_id(LibraryForeachIDData *data, bNodeTreeInterfaceItem &item)
{
switch (item.item_type) {
@@ -1096,11 +1041,6 @@ void bNodeTreeInterface::read_lib(BlendLibReader *reader, ID *id)
item_types::item_read_lib(reader, id, this->root_panel.item);
}
void bNodeTreeInterface::read_expand(BlendExpander *expander)
{
item_types::item_read_expand(expander, this->root_panel.item);
}
bNodeTreeInterfaceItem *bNodeTreeInterface::active_item()
{
bNodeTreeInterfaceItem *active = nullptr;