archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T38108: blender freeze in remembering operator properties.

Browse Source
This commit is contained in:
Brecht Van Lommel
2014-01-08 17:48:38 +01:00
parent cdeb3c3922
commit 09d6ad6142
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -893,6 +893,8 @@ bool WM_operator_last_properties_init(wmOperator *op)
bool changed = false; bool changed = false;
if (op->type->last_properties) { if (op->type->last_properties) {
IDPropertyTemplate val = {0};
IDProperty *replaceprops = IDP_New(IDP_GROUP, &val, "wmOperatorProperties");
PropertyRNA *iterprop; PropertyRNA *iterprop;
if (G.debug & G_DEBUG_WM) { if (G.debug & G_DEBUG_WM) {
@@ -915,13 +917,19 @@ bool WM_operator_last_properties_init(wmOperator *op)
* but for now RNA doesn't access nested operators */ * but for now RNA doesn't access nested operators */
idp_dst->flag |= IDP_FLAG_GHOST; idp_dst->flag |= IDP_FLAG_GHOST;
IDP_ReplaceInGroup(op->properties, idp_dst); /* add to temporary group instead of immediate replace,
* because we are iterating over this group */
IDP_AddToGroup(replaceprops, idp_dst);
changed = true; changed = true;
} }
} }
} }
} }
RNA_PROP_END; RNA_PROP_END;
IDP_MergeGroup(op->properties, replaceprops, true);
IDP_FreeProperty(replaceprops);
MEM_freeN(replaceprops);
} }
return changed; return changed;