diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/space_text/text_ops.c | 10 | ||||
-rw-r--r-- | source/blender/editors/space_time/space_time.c | 4 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_smart_stitch.c | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 29583a9356e..5517f428678 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -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) diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index 65ef3273e30..bf1b1ddc18a 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -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); diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index b2a9b6bb572..c012a23c175 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -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; |