Commit: 2b9738b7f814a7c5cae02d283d0958a2a0284cb5
Author: Campbell Barton
Date: Fri Apr 21 17:14:13 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB2b9738b7f814a7c5cae02d283d0958a2a0284cb5
Merge branch 'master' into 28
===================================================================
===================================================================
diff --cc source/blender/editors/space_view3d/drawobject.c
index adf17117dae,0436f1335d8..1d0dacdd6d9
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -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];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
