[Bf-blender-cvs] [9019f8c] master: Revert "Proxy: Construct pchan hash when syncing armature proxy"

Sergey Sharybin noreply at git.blender.org
Tue Nov 15 16:14:17 CET 2016


Commit: 9019f8ca95d3316cd45abe024ac71d21a9793044
Author: Sergey Sharybin
Date:   Tue Nov 15 16:13:24 2016 +0100
Branches: master
https://developer.blender.org/rB9019f8ca95d3316cd45abe024ac71d21a9793044

Revert "Proxy: Construct pchan hash when syncing armature proxy"

This reverts commit 9b5a32cbfb8a8565202bdccd232c53f98b62eeec.

Apparently it is possible to have other thread mocking around with the hash.

Needs deeper investigation, for the time being reverting to prevent crashes.

===================================================================

M	source/blender/blenkernel/intern/armature.c

===================================================================

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index badfeae..2b33394 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1781,7 +1781,6 @@ static void pose_proxy_synchronize(Object *ob, Object *from, int layer_protected
 	BLI_duplicatelist(&pose->agroups, &frompose->agroups);
 	pose->active_group = frompose->active_group;
 
-	BKE_pose_channels_hash_make(frompose);
 	for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
 		pchanp = BKE_pose_channel_find_name(frompose, pchan->name);




More information about the Bf-blender-cvs mailing list