Commit: cabb53effa71d61684aea083c56bd5db3b3ac0c9
Author: Campbell Barton
Date: Sat Mar 16 21:49:33 2019 +1100
Branches: master
https://developer.blender.org/rBcabb53effa71d61684aea083c56bd5db3b3ac0c9
Correct error in 6aebb5a4d5f5c
===================================================================
M source/blender/draw/modes/edit_text_mode.c
===================================================================
diff --git a/source/blender/draw/modes/edit_text_mode.c
b/source/blender/draw/modes/edit_text_mode.c
index f52bfaccd5b..caebc94f3ce 100644
--- a/source/blender/draw/modes/edit_text_mode.c
+++ b/source/blender/draw/modes/edit_text_mode.c
@@ -151,9 +151,11 @@ static void EDIT_TEXT_engine_init(void *vedata)
* Assume that all Passes are NULL */
static void EDIT_TEXT_cache_init(void *vedata)
{
+ const DRWContextState *draw_ctx = DRW_context_state_get();
EDIT_TEXT_PassList *psl = ((EDIT_TEXT_Data *)vedata)->psl;
EDIT_TEXT_StorageList *stl = ((EDIT_TEXT_Data *)vedata)->stl;
+
if (!stl->g_data) {
/* Alloc transient pointers */
stl->g_data = MEM_mallocN(sizeof(*stl->g_data), __func__);
@@ -179,8 +181,8 @@ static void EDIT_TEXT_cache_init(void *vedata)
psl->text_box_pass = DRW_pass_create(
"Font Text Boxes",
DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH);
- stl->g_data->box_shgrp =
shgroup_dynlines_dashed_uniform_color(psl->text_box_pass,
G_draw.block.colorWire);
- stl->g_data->box_active_shgrp =
shgroup_dynlines_dashed_uniform_color(psl->text_box_pass,
G_draw.block.colorActive);
+ stl->g_data->box_shgrp =
shgroup_dynlines_dashed_uniform_color(psl->text_box_pass,
G_draw.block.colorWire, draw_ctx->sh_cfg);
+ stl->g_data->box_active_shgrp =
shgroup_dynlines_dashed_uniform_color(psl->text_box_pass,
G_draw.block.colorActive, draw_ctx->sh_cfg);
}
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
