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 c50ab49b4d - Show all commits

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

@ -72,7 +72,6 @@ static const char *text_format_glsl_literals_builtinfunc_data[] = {
"exp",
"exp2",
"faceforward",
"false",
"findLSB",
"findMSB",
"floatBitsToInt",
@ -169,7 +168,6 @@ static const char *text_format_glsl_literals_builtinfunc_data[] = {
"textureSamples",
"textureSize",
"transpose",
Gangneron marked this conversation as resolved Outdated
Clément Foucault commented 2024-01-08 22:34:49 +01:00
Outdated
Review
Copy Link

I don't think this exists. Same goes for the dxdy, dydx and dydy.

I don't think this exists. Same goes for the `dxdy`, `dydx` and `dydy`.
"true",
"trunc",
"uaddCarry",
"umulExtended",
@ -217,6 +215,7 @@ static const char *text_format_glsl_literals_reserved_data[] = {
"dmat4x3",
"dmat4x4",
"else",
"false",
"flat",
"float",
"for",
@ -268,6 +267,7 @@ static const char *text_format_glsl_literals_reserved_data[] = {
"struct",
"switch",
"texel",
"true",
"uniform",
"using",
"uvec2",