blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Fix T60267: Assert manipulating a collection

This commit is contained in:
Campbell Barton 2019-01-14 13:58:38 +11:00
parent 8a2d48d928
commit 723e469686
Notes: blender-bot 2023-02-14 08:08:54 +01:00 
Referenced by issue #60267, Debug Assert in wm_messagebus: Occurs when manipulating collection visibility and (un)linking from a python script
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/windowmanager/message_bus/intern/wm_message_bus.c
View File

@ -245,6 +245,10 @@ void WM_msg_id_remove(struct wmMsgBus *mbus, const struct ID *id)
* \note While we could have a separate type for ID's, use RNA since there is enough overlap.
* \{ */
/**
* \note #wmMsgBus.messages_tag_count isn't updated, caller must handle.
*/
void wm_msg_subscribe_value_free(
wmMsgSubscribeKey *msg_key, wmMsgSubscribeValueLink *msg_lnk)
{

33
source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
View File

@ -120,10 +120,15 @@ static void wm_msg_rna_update_by_id(
/* Remove any non-persistent values, so a single persistent
* value doesn't modify behavior for the rest. */
wmMsgSubscribeValueLink *msg_lnk_next;
for (wmMsgSubscribeValueLink *msg_lnk = key->head.values.first; msg_lnk; msg_lnk = msg_lnk_next) {
for (wmMsgSubscribeValueLink *msg_lnk = key->head.values.first, *msg_lnk_next;
msg_lnk;
msg_lnk = msg_lnk_next)
{
msg_lnk_next = msg_lnk->next;
if (msg_lnk->params.is_persistent == false) {
if (msg_lnk->params.tag) {
mbus->messages_tag_count -= 1;
}
wm_msg_subscribe_value_free(&key->head, msg_lnk);
}
}
@ -153,6 +158,18 @@ static void wm_msg_rna_update_by_id(
}
if (remove) {
for (wmMsgSubscribeValueLink *msg_lnk = key->head.values.first, *msg_lnk_next;
msg_lnk;
msg_lnk = msg_lnk_next)
{
msg_lnk_next = msg_lnk->next;
if (msg_lnk->params.is_persistent == false) {
if (msg_lnk->params.tag) {
mbus->messages_tag_count -= 1;
}
wm_msg_subscribe_value_free(&key->head, msg_lnk);
}
}
/* Failed to persist, remove the key. */
BLI_remlink(&mbus->messages, key);
wm_msg_rna_gset_key_free(key);
@ -176,6 +193,18 @@ static void wm_msg_rna_remove_by_id(struct wmMsgBus *mbus, const ID *id)
wmMsgSubscribeKey_RNA *key = BLI_gsetIterator_getKey(&gs_iter);
BLI_gsetIterator_step(&gs_iter);
if (key->msg.params.ptr.id.data == id) {
/* Clear here so we can decrement 'messages_tag_count'. */
for (wmMsgSubscribeValueLink *msg_lnk = key->head.values.first, *msg_lnk_next;
msg_lnk;
msg_lnk = msg_lnk_next)
{
msg_lnk_next = msg_lnk->next;
if (msg_lnk->params.tag) {
mbus->messages_tag_count -= 1;
}
wm_msg_subscribe_value_free(&key->head, msg_lnk);
}
BLI_remlink(&mbus->messages, key);
BLI_gset_remove(gs, key, NULL);
wm_msg_rna_gset_key_free(key);