diff options
| author | Kent Mein <mein@cs.umn.edu> | 2005-04-28 18:37:15 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2005-04-28 18:37:15 +0400 |
| commit | b705434c72ec268e0a2c23124d679a7d1b8c0a69 (patch) | |
| tree | de5b55174c0493f7fa0dfca1ef679025444aec9c /source/blender/blenkernel | |
| parent | 1d97a448cb2c6e67fa0fa2ceba311d141bed3951 (diff) | |
A couple more simple gcc4.X warnings fixed.
softbody.c I removed an unused var.
text.c added return values to 2 return statements that didn't have anything.
Makefile added $(FIX_STUBS_WARNINGS) to CFLAGS for the stub.
source/blender/src/editface.c fixed up int vs unsigned int stuff
source/blender/src/resources.c had two vars declared as unsigned char *
and then inputs to them were cast as char * so updated the casts.
Kent
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/text.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 13b587be4fe..0b78ead13c8 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -301,7 +301,6 @@ static int sb_deflect_face(Object *ob,float *actpos, float *futurepos,float *col { int deflected; float s_actpos[3], s_futurepos[3]; - SoftBody *sb= ob->soft; // is supposed to be there VECCOPY(s_actpos,actpos); if(futurepos) VECCOPY(s_futurepos,futurepos); diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 554c6940b84..d46742a6328 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -2173,8 +2173,8 @@ int setcurr_tab (Text *text) char *word = ":"; char *comm = "#"; char back_words[3][7] = {"return", "break", "pass"}; - if (!text) return; - if (!text->curl) return; + if (!text) return 0; + if (!text->curl) return 0; while (text->curl->line[i] == '\t') { @@ -2210,3 +2210,4 @@ int setcurr_tab (Text *text) } return i; } + |