blender
/
blender
137
418
Fork 600
Code Issues 6.3k Pull Requests 782 Projects 19 Wiki Activity

Text Editor: Add GLSL support language #116793

Closed
Gangneron wants to merge 68 commits from Gangneron/blender:Add_GLSL into main
pull from: Gangneron/blender:Add_GLSL
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 48 Commits 68 Files Changed 4 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 63b918d7a1 - Show all commits

2
source/blender/editors/space_text/text_format_glsl.cc
View File

@ -521,7 +521,7 @@ static void txtfmt_glsl_format_line(SpaceText *st, TextLine * line, const bool d
/* clang-format off */
/* Special vars(v) or built-in keywords(b) */
/* keep in sync with `txtfmt_osl_format_identifier()`. */
/* keep in sync with `txtfmt_glsl_format_identifier()`. */
if ((i = txtfmt_glsl_find_specialvar(str)) != -1) {prev = FMT_TYPE_SPECIAL;}
else if ((i = txtfmt_glsl_find_builtinfunc(str)) != -1) {prev = FMT_TYPE_KEYWORD;}