<div dir="ltr">Oops... Let this be a lesson to everyone that if doing temp work in a copy of a file, delete the original before renaming!<br><br><div class="gmail_quote">On Mon, Sep 29, 2008 at 4:37 AM, Martin Poirier <span dir="ltr"><<a href="mailto:theeth@yahoo.com">theeth@yahoo.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">Revision: 16789<br>
<a href="http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16789" target="_blank">http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16789</a><br>
Author: theeth<br>
Date: 2008-09-28 17:37:37 +0200 (Sun, 28 Sep 2008)<br>
<br>
Log Message:<br>
-----------<br>
reverting revision 16784 that broke compilation. Aligorith, please fix and recommit<br>
<br>
Revision Links:<br>
--------------<br>
<a href="http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16784" target="_blank">http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16784</a><br>
<br>
Modified Paths:<br>
--------------<br>
trunk/blender/source/blender/blenkernel/BKE_ipo.h<br>
trunk/blender/source/blender/blenkernel/intern/curve.c<br>
trunk/blender/source/blender/blenkernel/intern/ipo.c<br>
trunk/blender/source/blender/makesdna/DNA_ipo_types.h<br>
trunk/blender/source/blender/src/drawobject.c<br>
<br>
Modified: trunk/blender/source/blender/blenkernel/BKE_ipo.h<br>
===================================================================<br>
--- trunk/blender/source/blender/blenkernel/BKE_ipo.h 2008-09-28 13:51:30 UTC (rev 16788)<br>
+++ trunk/blender/source/blender/blenkernel/BKE_ipo.h 2008-09-28 15:37:37 UTC (rev 16789)<br>
@@ -54,71 +54,41 @@<br>
struct bActionChannel;<br>
struct rctf;<br>
<br>
-/* ------------ Time Management ------------ */<br>
-<br>
float frame_to_float(int cfra);<br>
<br>
-/* ------------ IPO Management ---------- */<br>
-<br>
void free_ipo_curve(struct IpoCurve *icu);<br>
void free_ipo(struct Ipo *ipo);<br>
-<br>
void ipo_default_v2d_cur(int blocktype, struct rctf *cur);<br>
-<br>
struct Ipo *add_ipo(char *name, int idcode);<br>
struct Ipo *copy_ipo(struct Ipo *ipo);<br>
-<br>
void ipo_idnew(struct Ipo *ipo);<br>
-<br>
-struct IpoCurve *find_ipocurve(struct Ipo *ipo, int adrcode);<br>
-short has_ipo_code(struct Ipo *ipo, int code);<br>
-<br>
-/* -------------- Make Local -------------- */<br>
-<br>
void make_local_obipo(struct Ipo *ipo);<br>
void make_local_matipo(struct Ipo *ipo);<br>
void make_local_keyipo(struct Ipo *ipo);<br>
void make_local_ipo(struct Ipo *ipo);<br>
+struct IpoCurve *find_ipocurve(struct Ipo *ipo, int adrcode);<br>
<br>
-/* ------------ IPO-Curve Sanity ---------------- */<br>
-<br>
void calchandles_ipocurve(struct IpoCurve *icu);<br>
void testhandles_ipocurve(struct IpoCurve *icu);<br>
void sort_time_ipocurve(struct IpoCurve *icu);<br>
int test_time_ipocurve(struct IpoCurve *icu);<br>
-<br>
-/* -------- IPO-Curve (Bezier) Calculations ---------- */<br>
-<br>
void correct_bezpart(float *v1, float *v2, float *v3, float *v4);<br>
int findzero(float x, float q0, float q1, float q2, float q3, float *o);<br>
void berekeny(float f1, float f2, float f3, float f4, float *o, int b);<br>
void berekenx(float *f, float *o, int b);<br>
-<br>
-/* -------- IPO Curve Calculation and Evaluation --------- */<br>
-<br>
float eval_icu(struct IpoCurve *icu, float ipotime);<br>
void calc_icu(struct IpoCurve *icu, float ctime);<br>
float calc_ipo_time(struct Ipo *ipo, float ctime);<br>
void calc_ipo(struct Ipo *ipo, float ctime);<br>
-<br>
-/* ------------ Keyframe Column Tools -------------- */<br>
-<br>
-void add_to_cfra_elem(struct ListBase *lb, struct BezTriple *bezt);<br>
-void make_cfra_list(struct Ipo *ipo, struct ListBase *elems);<br>
-<br>
-/* ---------------- IPO DataAPI ----------------- */<br>
-<br>
void write_ipo_poin(void *poin, int type, float val);<br>
float read_ipo_poin(void *poin, int type);<br>
-<br>
void *give_mtex_poin(struct MTex *mtex, int adrcode );<br>
-void *get_pchan_ipo_poin(struct bPoseChannel *pchan, int adrcode);<br>
+<br>
void *get_ipo_poin(struct ID *id, struct IpoCurve *icu, int *type);<br>
+void *get_pchan_ipo_poin(struct bPoseChannel *pchan, int adrcode);<br>
<br>
void set_icu_vars(struct IpoCurve *icu);<br>
<br>
-/* ---------------- IPO Execution --------------- */<br>
-<br>
void execute_ipo(struct ID *id, struct Ipo *ipo);<br>
void execute_action_ipo(struct bActionChannel *achan, struct bPoseChannel *pchan);<br>
<br>
@@ -129,17 +99,22 @@<br>
void do_seq_ipo(struct Sequence *seq, int cfra);<br>
void do_ob_ipodrivers(struct Object *ob, struct Ipo *ipo, float ctime);<br>
<br>
+int has_ipo_code(struct Ipo *ipo, int code);<br>
void do_all_data_ipos(void);<br>
-short calc_ipo_spec(struct Ipo *ipo, int adrcode, float *ctime);<br>
+int calc_ipo_spec(struct Ipo *ipo, int adrcode, float *ctime);<br>
void clear_delta_obipo(struct Ipo *ipo);<br>
+void add_to_cfra_elem(struct ListBase *lb, struct BezTriple *bezt);<br>
+void make_cfra_list(struct Ipo *ipo, struct ListBase *elems);<br>
<br>
-/* ----------- IPO <-> GameEngine API ---------------- */<br>
+/* the sort is an IPO_Channel... */<br>
+int IPO_GetChannels(struct Ipo *ipo, short *channels);<br>
<br>
-/* the short is an IPO_Channel... */<br>
+float IPO_GetFloatValue(struct Ipo *ipo,<br>
+/* struct IPO_Channel channel, */<br>
+ /* channels are shorts... bit ugly for now*/<br>
+ short c,<br>
+ float ctime);<br>
<br>
-short IPO_GetChannels(struct Ipo *ipo, short *channels);<br>
-float IPO_GetFloatValue(struct Ipo *ipo, short c, float ctime);<br>
-<br>
#ifdef __cplusplus<br>
};<br>
#endif<br>
<br>
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c<br>
===================================================================<br>
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2008-09-28 13:51:30 UTC (rev 16788)<br>
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2008-09-28 15:37:37 UTC (rev 16789)<br>
@@ -1509,7 +1509,7 @@<br>
BevList *bl, *blnew, *blnext;<br>
BevPoint *bevp, *bevp2, *bevp1 = NULL, *bevp0;<br>
float min, inp, x1, x2, y1, y2, vec[3];<br>
- float *coord_array, *tilt_array=NULL, *radius_array=NULL, *coord_fp, *tilt_fp=NULL, *radius_fp=NULL;<br>
+ float *coord_array, *tilt_array=NULL, *radius_array=NULL, *coord_fp, *tilt_fp=NULL, *radius_fp;<br>
float *v1, *v2;<br>
struct bevelsort *sortdata, *sd, *sd1;<br>
int a, b, nr, poly, resolu, len=0;<br>
<br>
Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c<br>
===================================================================<br>
--- trunk/blender/source/blender/blenkernel/intern/ipo.c 2008-09-28 13:51:30 UTC (rev 16788)<br>
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c 2008-09-28 15:37:37 UTC (rev 16789)<br>
@@ -77,8 +77,6 @@<br>
<br>
#define SMALL -1.0e-10<br>
<br>
-#if 0 // IPO_OLD_TEMP<br>
-<br>
/* This array concept was meant to make sure that defines such as OB_LOC_X<br>
don't have to be enumerated, also for backward compatibility, future changes,<br>
and to enable it all can be accessed with a for-next loop.<br>
@@ -971,7 +969,7 @@<br>
cvalue+= cycyofs;<br>
}<br>
else if( (prevbezt+a)->vec[1][0]<=ipotime) {<br>
- if( (icu->extrap & IPO_DIR) && (icu->ipo!=IPO_CONST)) {<br>
+ if( (icu->extrap & IPO_DIR) && icu->ipo!=IPO_CONST) {<br>
prevbezt+= a;<br>
<br>
if (icu->ipo==IPO_LIN) {<br>
@@ -2582,5 +2580,3 @@<br>
<br>
return ctime;<br>
}<br>
-<br>
-#endif // IPO_OLD_TEMP<br>
<br>
Modified: trunk/blender/source/blender/makesdna/DNA_ipo_types.h<br>
===================================================================<br>
--- trunk/blender/source/blender/makesdna/DNA_ipo_types.h 2008-09-28 13:51:30 UTC (rev 16788)<br>
+++ trunk/blender/source/blender/makesdna/DNA_ipo_types.h 2008-09-28 15:37:37 UTC (rev 16789)<br>
@@ -201,8 +201,6 @@<br>
#define MA_MAP17 (1<<21)<br>
#define MA_MAP18 (1<<22)<br>
<br>
-/* ********** Texture Slots (MTex) ********** */<br>
-<br>
#define TEX_TOTNAM 14<br>
<br>
#define MAP_OFS_X 1<br>
<br>
Modified: trunk/blender/source/blender/src/drawobject.c<br>
===================================================================<br>
--- trunk/blender/source/blender/src/drawobject.c 2008-09-28 13:51:30 UTC (rev 16788)<br>
+++ trunk/blender/source/blender/src/drawobject.c 2008-09-28 15:37:37 UTC (rev 16789)<br>
@@ -4816,8 +4816,7 @@<br>
warning_recursive= 1;<br>
<br>
elems.first= elems.last= 0;<br>
- // warning: no longer checks for certain ob-keys only... (so does this need to use the proper ipokeys then?)<br>
- make_cfra_list(ob->ipo, &elems);<br>
+ make_cfra_list(ob->ipo, &elems);<br>
<br>
cfraont= (G.scene->r.cfra);<br>
drawtype= G.vd->drawtype;<br>
<br>
<br>
_______________________________________________<br>
Bf-blender-cvs mailing list<br>
<a href="mailto:Bf-blender-cvs@blender.org">Bf-blender-cvs@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/bf-blender-cvs" target="_blank">http://lists.blender.org/mailman/listinfo/bf-blender-cvs</a><br>
</blockquote></div><br></div>