Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_info / textview.c
index 3f35cad..85de70c 100644 (file)
@@ -63,7 +63,7 @@ typedef struct ConsoleDrawContext {
        int ymin, ymax;
        int *xy; // [2]
        int *sel; // [2]
-       int *pos_pick; // bottom of view == 0, top of file == combine chars, end of line is lower then start. 
+       int *pos_pick; // bottom of view == 0, top of file == combine chars, end of line is lower then start.
        const int *mval; // [2]
        int draw;
 } ConsoleDrawContext;
@@ -181,14 +181,14 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str
                size_t len = str_len - initial_offset;
                const char *s = str + initial_offset;
                int i;
-               
+
                int sel_orig[2];
                copy_v2_v2_int(sel_orig, cdc->sel);
 
                /* invert and swap for wrapping */
                cdc->sel[0] = str_len - sel_orig[1];
                cdc->sel[1] = str_len - sel_orig[0];
-               
+
                if (bg) {
                        Gwn_VertFormat *format = immVertexFormat();
                        unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
@@ -219,7 +219,7 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str
 
                        BLF_position(cdc->font_id, cdc->xy[0], cdc->lofs + cdc->xy[1], 0);
                        BLF_draw_mono(cdc->font_id, s, len, cdc->cwidth);
-                       
+
                        if (cdc->sel[0] != cdc->sel[1]) {
                                console_step_sel(cdc, len);
                                /* BLF_color3ub(cdc->font_id, 0, 255, 0); // debug */
@@ -227,7 +227,7 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str
                        }
 
                        cdc->xy[1] += cdc->lheight;
-                       
+
                        /* check if were out of view bounds */
                        if (cdc->xy[1] > cdc->ymax) {
                                MEM_freeN(offsets);
@@ -254,7 +254,7 @@ static int console_draw_string(ConsoleDrawContext *cdc, const char *str, int str
                BLF_color3ubv(cdc->font_id, fg);
                BLF_position(cdc->font_id, cdc->xy[0], cdc->lofs + cdc->xy[1], 0);
                BLF_draw_mono(cdc->font_id, str, str_len, cdc->cwidth);
-               
+
                if (cdc->sel[0] != cdc->sel[1]) {
                        int isel[2];