[Bf-blender-cvs] [13ee5ba467d] master: Store edit-font select-box length

[Campbell Barton]

Commit: 13ee5ba467d69b80f025d0d2542ed190ad1667db
Author: Campbell Barton
Date:   Fri Apr 21 17:08:28 2017 +1000
Branches: master
https://developer.blender.org/rB13ee5ba467d69b80f025d0d2542ed190ad1667db

Store edit-font select-box length

A little awkward to calculate when drawing.

===================================================================

M       source/blender/blenkernel/BKE_font.h
M       source/blender/blenkernel/intern/font.c
M       source/blender/editors/space_view3d/drawobject.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_font.h 
b/source/blender/blenkernel/BKE_font.h
index 6775639125f..e7ae0f606e7 100644
--- a/source/blender/blenkernel/BKE_font.h
+++ b/source/blender/blenkernel/BKE_font.h
@@ -60,8 +60,9 @@ typedef struct EditFont {
        struct CharInfo *textbufinfo;
        
        /* array of rectangles & rotation */
-       EditFontSelBox *selboxes;
        float textcurs[4][2];
+       EditFontSelBox *selboxes;
+       int selboxes_len;
 
        /* positional vars relative to the textbuf, textbufinfo (not utf8 bytes)
         * a copy of these is kept in Curve, but use these in editmode */
diff --git a/source/blender/blenkernel/intern/font.c 
b/source/blender/blenkernel/intern/font.c
index 580842fe176..401fed74c52 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -695,10 +695,14 @@ bool BKE_vfont_to_curve_ex(Main *bmain, Object *ob, int 
mode, ListBase *r_nubase
                if (ef->selboxes)
                        MEM_freeN(ef->selboxes);
 
-               if (BKE_vfont_select_get(ob, &selstart, &selend))
-                       ef->selboxes = MEM_callocN((selend - selstart + 1) * 
sizeof(EditFontSelBox), "font selboxes");
-               else
+               if (BKE_vfont_select_get(ob, &selstart, &selend)) {
+                       ef->selboxes_len = (selend - selstart) + 1;
+                       ef->selboxes = MEM_callocN(ef->selboxes_len * 
sizeof(EditFontSelBox), "font selboxes");
+               }
+               else {
+                       ef->selboxes_len = 0;
                        ef->selboxes = NULL;
+               }
 
                selboxes = ef->selboxes;
        }
diff --git a/source/blender/editors/space_view3d/drawobject.c 
b/source/blender/editors/space_view3d/drawobject.c
index 71e10c9dffc..0436f1335d8 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -6472,7 +6472,6 @@ static void draw_editfont(Scene *scene, View3D *v3d, 
RegionView3D *rv3d, Base *b
        Curve *cu = ob->data;
        EditFont *ef = cu->editfont;
        float vec1[3], vec2[3];
-       int selstart, selend;
 
        draw_editfont_textcurs(rv3d, ef->textcurs);
 
@@ -6525,17 +6524,16 @@ static void draw_editfont(Scene *scene, View3D *v3d, 
RegionView3D *rv3d, Base *b
        setlinestyle(0);
 
 
-       if (BKE_vfont_select_get(ob, &selstart, &selend) && ef->selboxes) {
-               const int seltot = selend - selstart;
+       if (ef->selboxes && ef->selboxes_len) {
                float selboxw;
 
                cpack(0xffffff);
                set_inverted_drawing(1);
-               for (int i = 0; i <= seltot; i++) {
+               for (int i = 0; i < ef->selboxes_len; i++) {
                        EditFontSelBox *sb = &ef->selboxes[i];
                        float tvec[3];
 
-                       if (i != seltot) {
+                       if (i + 1 != ef->selboxes_len) {
                                if (ef->selboxes[i + 1].y == sb->y)
                                        selboxw = ef->selboxes[i + 1].x - sb->x;
                                else

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs