From ca6824a640c09bb6a009ffa80b23dec6ccef36a4 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 16 Nov 2006 11:49:14 +0000 Subject: [PATCH] Correction commit, didn't have the console in correct directory! Log again: Log: 1) Bugfix: Beziers in curve didn't calculate the tilt values correctly for the endpoint and not for all handle types. That way deforming curves didn't extend the tilted deform either. (IRC report by Jahka) 2) If you setup a Proxy for Armatures, the protected bones now have an error pupup for buttons and for some of the tools in 3d window (constraint edit mostly). Also the Bones Panel shows a note when the bone is not editable. --- source/blender/blenkernel/intern/armature.c | 2 +- source/blender/blenkernel/intern/curve.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 251a14fd4b3..0a1787cb58c 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1064,7 +1064,7 @@ void armature_rebuild_pose(Object *ob, bArmature *arm) // printf("rebuild pose %s, %d bones\n", ob->id.name, counter); /* synchronize protected layers with proxy */ - if(ob->id.lib==NULL && ob->proxy) + if(OB_IS_PROXY(ob)) pose_proxy_synchronize(ob, ob->proxy, arm->layer_protected); update_pose_constraint_flags(ob->pose); // for IK detection for example diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 72cfb820138..2fa4fd25d06 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1441,7 +1441,7 @@ static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float * for(a=0; aalfa + t[1]*prevbezt->alfa + t[2]*bezt->alfa + t[3]*next->alfa; } @@ -1593,6 +1593,7 @@ void makeBevelList(Object *ob) bevp->x= prevbezt->vec[1][0]; bevp->y= prevbezt->vec[1][1]; bevp->z= prevbezt->vec[1][2]; + bevp->alfa= prevbezt->alfa; bl->nr++; }