sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Compile warnings, typos and some clarifications.

Browse Source
This commit is contained in:
Guillermo S. Romero 2009-04-21 17:37:07 +00:00
parent 95b43536f6
commit c5756a9822
9 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/bad_level_call_stubs/stubs.c
View File

@ -327,7 +327,7 @@ void antialias_tagbuf(int xsize, int ysize, char *rectmove) {}
/* 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 @@ void BIF_filelist_freelib(struct FileList* filelist) {};
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){};

4
source/blender/blenkernel/intern/image.c
View File

@ -407,7 +407,7 @@ static ImBuf *add_ibuf_size(int width, int height, char *name, int floatbuf, sho
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 @@ static void stampdata(StampData *stamp_data, int do_prefix)
}
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>");

6
source/blender/imbuf/intern/rotate.c
View File

@ -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_flipy(struct ImBuf * ibuf)
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 @@ void IMB_flipx(struct ImBuf * ibuf)
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]);
}
}
}

2
source/blender/include/BIF_editseq.h
View File

@ -41,7 +41,7 @@ void reload_sequence(void);
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);

2
source/blender/include/blendef.h
View File

@ -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

2
source/blender/src/editseq.c
View File

@ -174,7 +174,7 @@ void clear_last_seq()
_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;

6
source/blender/src/header_info.c
View File

@ -1929,7 +1929,7 @@ static uiBlock *info_timelinemenu(void *arg_unused)
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 @@ static uiBlock *info_render_bakemenu(void *arg_unused)
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, "");

12
source/blender/src/meshtools.c
View File

@ -650,9 +650,9 @@ static void mesh_octree_add_nodes(MocNode **basetable, float *co, float *offs, f
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 @@ EditVert *editmesh_get_x_mirror_vert(Object *ob, float *co)
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;

10
source/creator/buildinfo.c
View File

@ -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