Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-01-16 08:05:01 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-01-16 08:05:01 +0400
commitd0e65f2bf4d5e2140752c0695d19507ffee1ebd8 (patch)
tree419a3c76aecdd26113b8649f64e3198fc23b403e /source/blender/editors/space_text/text_format_osl.c
parent6fd5645d56b9e2d34a683fa21139d975c8be02aa (diff)
text syntax highlighting: don't use utf8 stepping if we know the text is ascii
Diffstat (limited to 'source/blender/editors/space_text/text_format_osl.c')
-rw-r--r--source/blender/editors/space_text/text_format_osl.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_text/text_format_osl.c b/source/blender/editors/space_text/text_format_osl.c
index 26bb5f66cef..7d493eb1f62 100644
--- a/source/blender/editors/space_text/text_format_osl.c
+++ b/source/blender/editors/space_text/text_format_osl.c
@@ -295,7 +295,12 @@ static void txtfmt_osl_format_line(SpaceText *st, TextLine *line, const int do_n
else if ((i = txtfmt_osl_find_preprocessor(str)) != -1) prev = FMT_TYPE_DIRECTIVE;
if (i > 0) {
- text_format_fill(&str, &fmt, prev, i);
+ if (prev == FMT_TYPE_DIRECTIVE) { /* can contain utf8 */
+ text_format_fill(&str, &fmt, prev, i);
+ }
+ else {
+ text_format_fill_ascii(&str, &fmt, prev, i);
+ }
}
else {
str += BLI_str_utf8_size_safe(str) - 1;