Merge branch 'master' into 28
authorCampbell Barton <ideasman42@gmail.com>
Fri, 21 Apr 2017 07:14:13 +0000 (17:14 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 21 Apr 2017 07:14:13 +0000 (17:14 +1000)
1  2 
source/blender/blenkernel/intern/pointcache.c
source/blender/editors/include/ED_image.h
source/blender/editors/include/ED_node.h
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/modifiers/intern/MOD_surfacedeform.c

index adf17117dae63508467877cdbc7b62460b019403,0436f1335d8e8562b8a3d1f2f26f4d1621ae544c..1d0dacdd6d941c2fa372c2bb0abeb468499d68dd
@@@ -7495,15 -6524,12 +7494,14 @@@ static void draw_editfont(Scene *scene
        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);
 +              unsigned int pos = VertexFormat_add_attrib(immVertexFormat(), "pos", COMP_F32, 3, KEEP_FLOAT);
 +              immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
 +              imm_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];