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