Revision: 28647
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28647
Author: aligorith
Date: 2010-05-07 12:59:48 +0200 (Fri, 07 May 2010)
Log Message:
-----------
Minor formatting tweaks (killing some "caterpillar if's"... yuck those things
are nasty to edit/extend)
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
Modified: trunk/blender/source/blender/editors/object/object_constraint.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_constraint.c
2010-05-07 09:48:40 UTC (rev 28646)
+++ trunk/blender/source/blender/editors/object/object_constraint.c
2010-05-07 10:59:48 UTC (rev 28647)
@@ -609,6 +609,7 @@
}
/* ------------- Child-Of Constraint ------------------ */
+
/* ChildOf Constraint - set inverse callback */
static int childof_set_inverse_exec (bContext *C, wmOperator *op)
{
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2010-05-07
09:48:40 UTC (rev 28646)
+++ trunk/blender/source/blender/editors/transform/transform.c 2010-05-07
10:59:48 UTC (rev 28647)
@@ -210,7 +210,8 @@
//vec[0] = vec[0]/((t->scene->r.frs_sec /
t->scene->r.frs_sec_base));
UI_view2d_to_region_no_clip((View2D *)t->view, vec[0],
vec[1], out, out+1);
- } else {
+ }
+ else {
UI_view2d_to_region_no_clip((View2D *)t->view, vec[0],
vec[1], out, out+1);
}
@@ -5308,19 +5309,19 @@
const short doTime= 0; //XXX doesn't work -
getAnimEdit_DrawTime(t);
const double secf= FPS;
double val;
-
+
/* convert frame to nla-action time (if needed) */
if (adt)
val= BKE_nla_tweakedit_remap(adt, *(td->val),
NLATIME_CONVERT_MAP);
else
val= *(td->val);
-
+
/* do the snapping to nearest frame/second */
if (doTime)
val= (float)( floor((val/secf) + 0.5f) * secf );
else
val= (float)( floor(val+0.5f) );
-
+
/* convert frame out of nla-action time */
if (adt)
*(td->val)= BKE_nla_tweakedit_remap(adt, val,
NLATIME_CONVERT_UNMAP);
@@ -5330,28 +5331,31 @@
/* snap key to nearest marker? */
else if (autosnap == SACTSNAP_MARKER) {
float val;
-
+
/* convert frame to nla-action time (if needed) */
if (adt)
val= BKE_nla_tweakedit_remap(adt, *(td->val),
NLATIME_CONVERT_MAP);
else
val= *(td->val);
-
+
/* snap to nearest marker */
// TODO: need some more careful checks for where data comes from
val=
(float)ED_markers_find_nearest_marker_time(&t->scene->markers, val);
-
+
/* convert frame out of nla-action time */
if (adt)
*(td->val)= BKE_nla_tweakedit_remap(adt, val,
NLATIME_CONVERT_UNMAP);
else
*(td->val)= val;
}
-
+
+ /* if the handles are to be moved too (as side-effect of keyframes
moving, to keep the general effect)
+ * offset them by the same amount so that the general angles are
maintained (i.e. won't change while
+ * handles are free-to-roam and keyframes are snap-locked)
+ */
if ((td->flag & TD_MOVEHANDLE1) && td2d->h1) {
td2d->h1[0] = td2d->ih1[0] + *td->val - td->ival;
}
-
if ((td->flag & TD_MOVEHANDLE2) && td2d->h2) {
td2d->h2[0] = td2d->ih2[0] + *td->val - td->ival;
}
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c
2010-05-07 09:48:40 UTC (rev 28646)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c
2010-05-07 10:59:48 UTC (rev 28647)
@@ -3295,12 +3295,16 @@
if (td->flag & TD_MOVEHANDLE1) {
td2d->h1 = bezt->vec[0];
VECCOPY2D(td2d->ih1, td2d->h1);
- } else td2d->h1 = NULL;
+ }
+ else
+ td2d->h1 = NULL;
if (td->flag & TD_MOVEHANDLE2) {
td2d->h2 = bezt->vec[2];
VECCOPY2D(td2d->ih2, td2d->h2);
- } else td2d->h2 = NULL;
+ }
+ else
+ td2d->h2 = NULL;
memset(td->axismtx, 0, sizeof(td->axismtx));
td->axismtx[2][2] = 1.0f;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
