Commit: 723e4696860a05018e532b0695177d68a1b5f75e
Author: Campbell Barton
Date: Mon Jan 14 13:58:38 2019 +1100
Branches: master
https://developer.blender.org/rB723e4696860a05018e532b0695177d68a1b5f75e
Fix T60267: Assert manipulating a collection
===================================================================
M source/blender/windowmanager/message_bus/intern/wm_message_bus.c
M source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
===================================================================
diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus.c
b/source/blender/windowmanager/message_bus/intern/wm_message_bus.c
index 63a897b2faf..439f63d197f 100644
--- a/source/blender/windowmanager/message_bus/intern/wm_message_bus.c
+++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus.c
@@ -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)
{
diff --git
a/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
b/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
index 619777fc671..6934f15a644 100644
--- a/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
+++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
@@ -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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
