blender
/
blender
135
420
Fork 604
Code Issues 6.4k Pull Requests 758 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 +15 -3
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3162c3f35f - Show all commits

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

@ -1,7 +1,14 @@
/* SPDX-FileCopyrightText: 2008 Blender Authors
*
* SPDX-License-Identifier: GPL-2.0-or-later */
/** \file
* \ingroup sptext
*/
#include <cstring>
/*He is posible of change #include <cstring> by */
/*import std:string*/
/*"include <cstring> can be replace by import std:string;"*/
#include "BLI_blendlib.h"
Gangneron marked this conversation as resolved
Campbell Barton commented 2024-01-09 22:52:53 +01:00
Review
Copy Link

This header doesn't exist.

This header doesn't exist.
@ -27,9 +34,11 @@ static int textformat_glsl_literals_builtinfunc_data[]
"do"
"double"
"else"
"flat"
"float"
"for"
"if"
"in"
"int"
"inout"
"ivec2"
@ -45,7 +54,10 @@ static int textformat_glsl_literals_builtinfunc_data[]
"sampler3D"
"samplerCube"
"struct"
"texel"
"texel"
"uvec2"
"uvec3"
"uvec4"
"vec2"
"vec3"
"vec4"