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

quiet some warnings & (possible/unlikely error)

Browse Source
This commit is contained in:
Campbell Barton 2012-01-24 15:37:50 +00:00
parent 925234f1e0
commit 58c51bb551
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_text/text_ops.c
View File

@ -2412,7 +2412,7 @@ static void text_cursor_set_to_pos_wrapped(SpaceText *st, ARegion *ar, int x, in
{
Text *text = st->text;
int max = wrap_width(st, ar); /* view */
int charp; /* mem */
int charp = -1; /* mem */
int loop = 1, found = 0; /* flags */
char ch;
@ -2513,9 +2513,11 @@ static void text_cursor_set_to_pos_wrapped(SpaceText *st, ARegion *ar, int x, in
y--;
}
if(sel) { text->sell = linep; text->selc = charp; }
else { text->curl = linep; text->curc = charp; }
if (linep && charp != -1) {
if(sel) { text->sell = linep; text->selc = charp; }
else { text->curl = linep; text->curc = charp; }
}
}
static void text_cursor_set_to_pos(SpaceText *st, ARegion *ar, int x, int y, int sel)

4
source/blender/editors/space_time/space_time.c
View File

@ -193,6 +193,10 @@ static void time_draw_cache(SpaceTime *stime, Object *ob)
col[0] = 1.0; col[1] = 0.1; col[2] = 0.75;
col[3] = 0.1;
break;
default:
BLI_assert(0);
col[0] = 1.0; col[1] = 0.0; col[2] = 1.0;
col[3] = 0.1;
}
glColor4fv(col);

2
source/blender/editors/uvedit/uvedit_smart_stitch.c
View File

@ -565,7 +565,7 @@ static void stitch_validate_stichability(UvElement *element, StitchState *state,
static int stitch_process_data(StitchState *state, Scene *scene, int final)
{
int i;
StitchPreviewer *preview = uv_get_stitch_previewer();
StitchPreviewer *preview;
IslandStitchData *island_stitch_data = NULL;
int previous_island = state->static_island;
EditFace *efa;