[Bf-blender-cvs] [02bed8fcbf2] custom-manipulators: Accidentally removed last commit
Campbell Barton
noreply at git.blender.org
Tue May 30 07:55:47 CEST 2017
Commit: 02bed8fcbf237bb83b5ca19686895f2068d16109
Author: Campbell Barton
Date: Tue May 30 15:55:58 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB02bed8fcbf237bb83b5ca19686895f2068d16109
Accidentally removed last commit
===================================================================
M source/blender/blenkernel/intern/armature.c
===================================================================
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index f940916532f..d1231725400 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1872,6 +1872,9 @@ static void pose_proxy_synchronize(Object *ob, Object *from, int layer_protected
/* copy data in temp back over to the cleaned-out (but still allocated) original channel */
*pchan = pchanw;
+ if (pchan->custom) {
+ id_us_plus(&pchan->custom->id);
+ }
}
else {
/* always copy custom shape */
@@ -2502,4 +2505,4 @@ void BKE_pose_fmap_cache_update(Depsgraph *graph, Object *ob_pose)
}
}
DEG_OBJECT_ITER_END
-}
\ No newline at end of file
+}
More information about the Bf-blender-cvs
mailing list