Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2005-11-15 01:21:56 +0300
committerTon Roosendaal <ton@blender.org>2005-11-15 01:21:56 +0300
commit621d4a700d928c6104b2a8f6f5c30f08a5f57f02 (patch)
treeaa6f83caad34f50617681bac8c38ecc093a63b59 /source/blender/src/drawarmature.c
parent091602968388a9ce82519c43b451ade054cbf538 (diff)
Small fixes;
- Bone Ghost drawing now skips axes and names - "Snap to cursor" now works for parent-less bones in PoseMode - Prevented assigning in buttons of negative zero (was confusing)
Diffstat (limited to 'source/blender/src/drawarmature.c')
-rw-r--r--source/blender/src/drawarmature.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/src/drawarmature.c b/source/blender/src/drawarmature.c
index 00b8840d80b..1a6133c8f70 100644
--- a/source/blender/src/drawarmature.c
+++ b/source/blender/src/drawarmature.c
@@ -1722,7 +1722,7 @@ static void draw_ghost_poses(Base *base)
bPose *posen, *poseo;
bActionStrip *strip;
float cur, start, end, stepsize, range, colfac, actframe;
- int cfrao, maptime;
+ int cfrao, maptime, flago;
/* pre conditions, get an action with sufficient frames */
if(ob->action==NULL)
@@ -1747,13 +1747,15 @@ static void draw_ghost_poses(Base *base)
cfrao= CFRA;
if(maptime) actframe= get_action_frame(ob, (float)CFRA);
else actframe= CFRA;
+ flago= arm->flag;
+ arm->flag &= ~(ARM_DRAWNAMES|ARM_DRAWAXES);
/* copy the pose */
poseo= ob->pose;
copy_pose(&posen, ob->pose, 1);
ob->pose= posen;
armature_rebuild_pose(ob, ob->data); /* child pointers for IK */
-
+
glEnable(GL_BLEND);
if(G.vd->zbuf) glDisable(GL_DEPTH_TEST);
@@ -1794,8 +1796,10 @@ static void draw_ghost_poses(Base *base)
free_pose_channels(posen);
MEM_freeN(posen);
+ /* restore */
CFRA= cfrao;
ob->pose= poseo;
+ arm->flag= flago;
armature_rebuild_pose(ob, ob->data);
ob->flag |= OB_POSEMODE;