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

svn merge -r36801:36840 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Browse Source
This commit is contained in:
Campbell Barton
2011-05-24 04:35:21 +00:00
parent 94b8a81c17 1e00590f1c
commit 671cb93f1b
70 changed files with 540 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/transform/transform_conversions.c
View File

@@ -3832,7 +3832,7 @@ void flushTransGraphData(TransInfo *t)
/* if int-values only, truncate to integers */
if (td->flag & TD_INTVALUES)
td2d->loc2d[1]= (float)((int)td2d->loc[1]);
td2d->loc2d[1]= floorf(td2d->loc[1] + 0.5f);
else
td2d->loc2d[1]= td2d->loc[1];
@@ -5070,8 +5070,8 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
/* when running transform non-interactively (operator exec),
* we need to update the pose otherwise no updates get called during
* transform and the auto-ik is not applied. see [#26164] */
struct Object *ob=t->poseobj;
where_is_pose(t->scene, ob);
struct Object *pose_ob=t->poseobj;
where_is_pose(t->scene, pose_ob);
}
/* if target-less IK grabbing, we calculate the pchan transforms and clear flag */