Revision: 19856
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19856
Author: gsrb3d
Date: 2009-04-21 19:37:07 +0200 (Tue, 21 Apr 2009)
Log Message:
-----------
Compile warnings, typos and some clarifications.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/imbuf/intern/rotate.c
trunk/blender/source/blender/include/BIF_editseq.h
trunk/blender/source/blender/include/blendef.h
trunk/blender/source/blender/src/editseq.c
trunk/blender/source/blender/src/header_info.c
trunk/blender/source/blender/src/meshtools.c
trunk/blender/source/creator/buildinfo.c
Modified: trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
2009-04-21 17:24:16 UTC (rev 19855)
+++ trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
2009-04-21 17:37:07 UTC (rev 19856)
@@ -327,7 +327,7 @@
/* imagetexture.c stub */
void ibuf_sample(struct ImBuf *ibuf, float fx, float fy, float dx, float dy,
float *result) {}
-void update_for_newframe() {}
+void update_for_newframe(void) {}
struct FileList;
void BIF_filelist_freelib(struct FileList* filelist) {};
@@ -336,7 +336,8 @@
TimeMarker *get_frame_marker(int frame){return 0;};
/* editseq.c */
-Sequence *get_forground_frame_seq(int frame){return 0;};
+#include "BIF_editseq.h" // And fix the missing void there
+Sequence *get_foreground_frame_seq(int frame){return 0;};
void clear_last_seq(Sequence *seq){};
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2009-04-21
17:24:16 UTC (rev 19855)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2009-04-21
17:37:07 UTC (rev 19856)
@@ -407,7 +407,7 @@
unsigned char *rect= NULL;
float *rect_float= NULL;
int x, y;
- int checkerwidth=21, dark=1;
+ int checkerwidth=32, dark=1;
if (floatbuf) {
ibuf= IMB_allocImBuf(width, height, 24, IB_rectfloat, 0);
@@ -1024,7 +1024,7 @@
}
if (G.scene->r.stamp & R_STAMP_SEQSTRIP) {
- Sequence *seq = get_forground_frame_seq(CFRA);
+ Sequence *seq = get_foreground_frame_seq(CFRA);
if (seq) strcpy(text, seq->name+2);
else strcpy(text, "<none>");
Modified: trunk/blender/source/blender/imbuf/intern/rotate.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/rotate.c 2009-04-21 17:24:16 UTC
(rev 19855)
+++ trunk/blender/source/blender/imbuf/intern/rotate.c 2009-04-21 17:37:07 UTC
(rev 19856)
@@ -30,6 +30,7 @@
*/
#include "BLI_blenlib.h"
+#include "BKE_utildefines.h"
#include "imbuf.h"
#include "imbuf_patch.h"
@@ -94,7 +95,6 @@
void IMB_flipx(struct ImBuf * ibuf)
{
short x, y, xr, xl, yi;
- unsigned int px;
float px_f[4];
if (ibuf == NULL) return;
@@ -105,9 +105,7 @@
if (ibuf->rect) {
for(yi=y-1;yi>=0;yi--) {
for(xr=x-1, xl=0; xr>=xl; xr--, xl++) {
- px = ibuf->rect[(x*yi)+xr];
- ibuf->rect[(x*yi)+xr] = ibuf->rect[(x*yi)+xl];
- ibuf->rect[(x*yi)+xl] = px;
+ SWAP(unsigned int, ibuf->rect[(x*yi)+xr],
ibuf->rect[(x*yi)+xl]);
}
}
}
Modified: trunk/blender/source/blender/include/BIF_editseq.h
===================================================================
--- trunk/blender/source/blender/include/BIF_editseq.h 2009-04-21 17:24:16 UTC
(rev 19855)
+++ trunk/blender/source/blender/include/BIF_editseq.h 2009-04-21 17:37:07 UTC
(rev 19856)
@@ -41,7 +41,7 @@
void update_seq_ipo_rect(struct Sequence * seq);
void update_seq_icu_rects(struct Sequence * seq);
struct Sequence* get_last_seq();
-struct Sequence* get_forground_frame_seq( int frame );
+struct Sequence* get_foreground_frame_seq( int frame );
void set_last_seq(struct Sequence * seq);
void clear_last_seq();
void del_seq(void);
Modified: trunk/blender/source/blender/include/blendef.h
===================================================================
--- trunk/blender/source/blender/include/blendef.h 2009-04-21 17:24:16 UTC
(rev 19855)
+++ trunk/blender/source/blender/include/blendef.h 2009-04-21 17:37:07 UTC
(rev 19856)
@@ -35,7 +35,7 @@
#define MAXFRAMEF 300000.0f
#define MINFRAME 1
-#define MINFRAMEF 1.0
+#define MINFRAMEF 1.0f
/* max length material array, 16 because of bits in matfrom */
#define MAXPICKBUF 10000
Modified: trunk/blender/source/blender/src/editseq.c
===================================================================
--- trunk/blender/source/blender/src/editseq.c 2009-04-21 17:24:16 UTC (rev
19855)
+++ trunk/blender/source/blender/src/editseq.c 2009-04-21 17:37:07 UTC (rev
19856)
@@ -174,7 +174,7 @@
_last_seq_init = 0;
}
-Sequence *get_forground_frame_seq(int frame)
+Sequence *get_foreground_frame_seq(int frame)
{
Editing *ed;
Sequence *seq, *best_seq=NULL;
Modified: trunk/blender/source/blender/src/header_info.c
===================================================================
--- trunk/blender/source/blender/src/header_info.c 2009-04-21 17:24:16 UTC
(rev 19855)
+++ trunk/blender/source/blender/src/header_info.c 2009-04-21 17:37:07 UTC
(rev 19856)
@@ -1929,7 +1929,7 @@
void do_info_render_bakemenu(void *arg, int event)
{
switch (event) {
- case 6:
+ case (R_BAKE_TO_ACTIVE|R_BAKE_OSA):
G.scene->r.bake_flag ^= event;
break;
default:
@@ -1948,9 +1948,9 @@
uiBlockSetButmFunc(block, do_info_render_bakemenu, NULL);
if(G.scene->r.bake_flag & R_BAKE_TO_ACTIVE) {
- uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Selected
to Active", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
+ uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Selected
to Active", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1,
(R_BAKE_TO_ACTIVE|R_BAKE_OSA), "");
} else {
- uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Selected
to Active", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
+ uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Selected
to Active", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1,
(R_BAKE_TO_ACTIVE|R_BAKE_OSA), "");
}
uiDefBut(block, SEPR, 0, "", 0, yco-=6,
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
Modified: trunk/blender/source/blender/src/meshtools.c
===================================================================
--- trunk/blender/source/blender/src/meshtools.c 2009-04-21 17:24:16 UTC
(rev 19855)
+++ trunk/blender/source/blender/src/meshtools.c 2009-04-21 17:37:07 UTC
(rev 19856)
@@ -650,9 +650,9 @@
float fx, fy, fz;
int vx, vy, vz;
- if (isnan(co[0]) || !finite(co[0]) ||
- isnan(co[1]) || !finite(co[1]) ||
- isnan(co[2]) || !finite(co[2])
+ if (!finite(co[0]) ||
+ !finite(co[1]) ||
+ !finite(co[2])
) {
return;
}
@@ -869,9 +869,9 @@
intptr_t poinval;
/* ignore nan verts */
- if (isnan(co[0]) || !finite(co[0]) ||
- isnan(co[1]) || !finite(co[1]) ||
- isnan(co[2]) || !finite(co[2])
+ if (!finite(co[0]) ||
+ !finite(co[1]) ||
+ !finite(co[2])
)
return NULL;
Modified: trunk/blender/source/creator/buildinfo.c
===================================================================
--- trunk/blender/source/creator/buildinfo.c 2009-04-21 17:24:16 UTC (rev
19855)
+++ trunk/blender/source/creator/buildinfo.c 2009-04-21 17:37:07 UTC (rev
19856)
@@ -33,11 +33,11 @@
#ifdef BUILD_DATE
#ifndef WIN32
-char * build_date=BUILD_DATE;
-char * build_time=BUILD_TIME;
-char * build_rev=BUILD_REV;
-char * build_platform=BUILD_PLATFORM;
-char * build_type=BUILD_TYPE;
+const char * build_date=BUILD_DATE;
+const char * build_time=BUILD_TIME;
+const char * build_rev=BUILD_REV;
+const char * build_platform=BUILD_PLATFORM;
+const char * build_type=BUILD_TYPE;
#else
#include "winbuildinfo.h"
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
