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

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

@ -8,7 +8,7 @@
#include <cstring>
#include "BLI_blendlib.h"
#include "BLI_blenlib.h"
#include "DNA_space_types.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.
#include "DNA_text_types.h"
@ -21,7 +21,7 @@
/* Define all keywords who can use
*/
Gangneron marked this conversation as resolved Outdated
Campbell Barton commented 2024-01-09 12:53:44 +01:00
Outdated
Review
Copy Link

Use doxy-sections, https://developer.blender.org/docs/handbook/guidelines/c_cpp/#comment-sections

Use doxy-sections, https://developer.blender.org/docs/handbook/guidelines/c_cpp/#comment-sections
static const textformat_glsl_literals_builtinfunc_data[] = {
static const char *text_format_osl_literals_builtinfunc_data[] = {
/* clang-format off */
"attribute"
Gangneron marked this conversation as resolved Outdated
Campbell Barton commented 2024-01-09 22:53:45 +01:00
Outdated
Review
Copy Link

Wrong type.

Wrong type.
"bool"
Gangneron marked this conversation as resolved Outdated
Clément Foucault commented 2024-01-08 21:44:52 +01:00
Outdated
Review
Copy Link

I don't know what this Array is. And why is it with uppercase A?

I don't know what this `Array` is. And why is it with uppercase `A`?
@ -129,7 +129,8 @@ static const Span<const char *> textformat_glsl_literals_builtinfunc(
textformat_glsl_literals_builtinfunc_data,
ARRAY_SIZE(textformat_glsl_literals_builtinfunc_data));
static const char * text_format_glsl_literals_reserved_data[] = {
static const char * text_format_glsl_literals_reserved_data[]
{
/* clang-format off */
"abs"
"acos"
@ -321,7 +322,8 @@ static const Span<const char * > text_format_glsl_literals_reserved(
text_format_glsl_literals_reserved_data, ARRAY_SIZE(text_format_glsl_literals_reserved_data));
/* GLSL shader types */
static const char *text_format_glsl_literals_specialvar_data[] = {
static const char *text_format_glsl_literals_specialvar_data[]
{
/* Force single column , sorted list */
/* clang-format off */
"displacement",