Revision: 14327
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14327
Author: campbellbarton
Date: 2008-04-04 17:22:19 +0200 (Fri, 04 Apr 2008)
Log Message:
-----------
moved some duplicate lines into their own function
Modified Paths:
--------------
trunk/blender/source/blender/include/transform.h
trunk/blender/source/blender/src/editipo.c
trunk/blender/source/blender/src/transform_conversions.c
Modified: trunk/blender/source/blender/include/transform.h
===================================================================
--- trunk/blender/source/blender/include/transform.h 2008-04-04 15:06:50 UTC
(rev 14326)
+++ trunk/blender/source/blender/include/transform.h 2008-04-04 15:22:19 UTC
(rev 14327)
@@ -46,8 +46,8 @@
struct ScrArea;
struct bPose;
struct bConstraint;
+struct BezTriple;
-
typedef struct NDofInput {
int flag;
int axis;
@@ -472,6 +472,8 @@
void drawLine(float *center, float *dir, char axis, short options);
+TransDataCurveHandleFlags *initTransDataCurveHandes(TransData *td, struct
BezTriple *bezt);
+
/* DRAWLINE options flags */
#define DRAWLIGHT 1
#define DRAWDASHED 2
Modified: trunk/blender/source/blender/src/editipo.c
===================================================================
--- trunk/blender/source/blender/src/editipo.c 2008-04-04 15:06:50 UTC (rev
14326)
+++ trunk/blender/source/blender/src/editipo.c 2008-04-04 15:22:19 UTC (rev
14327)
@@ -5172,23 +5172,12 @@
/* only include handles
if selected, and interpolaton mode uses beztriples */
if
(ei->icu->ipo==IPO_BEZ) {
if (bezt->f1 &
SELECT) {
-
td->flag |= TD_BEZTRIPLE;
- hdata =
td->misc.hdata = MEM_mallocN(sizeof(TransDataCurveHandleFlags), "CuHandle
Data");
-
hdata->ih1 = bezt->h1;
-
hdata->h1 = &bezt->h1;
-
hdata->ih2 = bezt->h2; /* incase the second is not selected */
-
hdata->h2 = &bezt->h2;
-
+ hdata =
initTransDataCurveHandes(td, bezt);
bezt_to_transdata(td++, td2d++, bezt->vec[0], bezt->vec[1], 1, onlytime);
}
if (bezt->f3 &
SELECT) {
if
(hdata==NULL) {
-
td->flag |= TD_BEZTRIPLE;
-
hdata = td->misc.hdata = MEM_mallocN(sizeof(TransDataCurveHandleFlags),
"CuHandle Data");
-
hdata->ih1 = bezt->h1;
-
hdata->h1 = &bezt->h1;
-
hdata->ih2 = bezt->h2; /* incase the second is not selected */
-
hdata->h2 = &bezt->h2;
+
hdata = initTransDataCurveHandes(td, bezt);
}
bezt_to_transdata(td++, td2d++, bezt->vec[2], bezt->vec[1], 1, onlytime);
}
@@ -5199,12 +5188,7 @@
if
((bezt->f1&SELECT)==0 && (bezt->f3&SELECT)==0) {
if
(hdata==NULL) {
-
td->flag |= TD_BEZTRIPLE;
-
hdata = td->misc.hdata = MEM_mallocN(sizeof(TransDataCurveHandleFlags),
"CuHandle Data");
-
hdata->ih1 = bezt->h1;
-
hdata->h1 = &bezt->h1;
-
hdata->ih2 = bezt->h2; /* incase the second is not selected */
-
hdata->h2 = &bezt->h2;
+
hdata = initTransDataCurveHandes(td, bezt);
}
}
Modified: trunk/blender/source/blender/src/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/src/transform_conversions.c 2008-04-04
15:06:50 UTC (rev 14326)
+++ trunk/blender/source/blender/src/transform_conversions.c 2008-04-04
15:22:19 UTC (rev 14327)
@@ -1235,6 +1235,18 @@
}
}
+/* Utility function for getting the handle data from bezier's */
+TransDataCurveHandleFlags *initTransDataCurveHandes(TransData *td, struct
BezTriple *bezt) {
+ TransDataCurveHandleFlags *hdata;
+ td->flag |= TD_BEZTRIPLE;
+ hdata = td->misc.hdata = MEM_mallocN(sizeof(TransDataCurveHandleFlags),
"CuHandle Data");
+ hdata->ih1 = bezt->h1;
+ hdata->h1 = &bezt->h1;
+ hdata->ih2 = bezt->h2; /* incase the second is not selected */
+ hdata->h2 = &bezt->h2;
+ return hdata;
+}
+
static void createTransCurveVerts(TransInfo *t)
{
TransData *td = NULL;
@@ -1309,12 +1321,7 @@
td->tdi = NULL;
td->val = NULL;
- td->flag |= TD_BEZTRIPLE;
- hdata = td->misc.hdata =
MEM_mallocN(sizeof(TransDataCurveHandleFlags), "CuHandle Data");
- hdata->ih1 = bezt->h1;
- hdata->h1 = &bezt->h1;
- hdata->ih2 = bezt->h2; /*
incase the second is not selected */
- hdata->h2 = &bezt->h2;
+ hdata =
initTransDataCurveHandes(td, bezt);
Mat3CpyMat3(td->smtx, smtx);
Mat3CpyMat3(td->mtx, mtx);
@@ -1350,12 +1357,7 @@
if ((bezt->f1&SELECT)==0 &&
(bezt->f3&SELECT)==0)
/* If the middle is selected
but the sides arnt, this is needed */
if (hdata==NULL) { /* if the
handle was not saved by the previous handle */
- td->flag |=
TD_BEZTRIPLE;
- hdata = td->misc.hdata
= MEM_mallocN(sizeof(TransDataCurveHandleFlags), "CuHandle Data");
- hdata->ih1 = bezt->h1;
- hdata->h1 = &bezt->h1;
- hdata->ih2 = bezt->h2;
/* incase the second is not selected */
- hdata->h2 = &bezt->h2;
+ hdata =
initTransDataCurveHandes(td, bezt);
}
td++;
@@ -1381,12 +1383,7 @@
td->val = NULL;
if (hdata==NULL) { /* if the
handle was not saved by the previous handle */
- td->flag |=
TD_BEZTRIPLE;
- hdata = td->misc.hdata
= MEM_mallocN(sizeof(TransDataCurveHandleFlags), "CuHandle Data");
- hdata->ih1 = bezt->h1;
- hdata->h1 = &bezt->h1;
- hdata->ih2 = bezt->h2;
/* incase the second is not selected */
- hdata->h2 = &bezt->h2;
+ hdata =
initTransDataCurveHandes(td, bezt);
}
Mat3CpyMat3(td->smtx, smtx);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
