blender
/
blender
136
426
Fork 613
Code Issues 6.3k Pull Requests 780 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 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e709a581e - Show all commits

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

@ -126,7 +126,7 @@ static const char *text_format_glsl_literals_builtinfunc_data[] = {
};
static const Span<const char *> text_format_glsl_literals_builtinfunc(
textformat_glsl_literals_builtinfunc_data,
text_format_glsl_literals_builtinfunc_data,
ARRAY_SIZE(text_format_glsl_literals_builtinfunc_data));
static const char *text_format_glsl_literals_reserved_data[] = {
@ -574,7 +574,7 @@ void ED_text_format_register_glsl()
static TextFormatType tft = {nullptr};
static const char *ext[] = {"glsl", nullptr};
tft.format_identifier = txtfmt_glsl_format_identifier;
tft.format_identifier = txtfmt_glsl_format_identifier;
tft.format_line = txtfmt_glsl_format_line;
tft.ext = ext;
tft.comment_line = "//";