diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-12-30 06:51:29 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-12-30 06:51:29 +0400 |
| commit | 398da25b1b51cc2966791ca2f672617bc3677980 (patch) | |
| tree | 95b39934fef092a97363d9954ba54abee428c9ea /source/blender/editors/space_text | |
| parent | 33955940e4931e2184434393e0f8c15c36a5c3c6 (diff) | |
OSL Syntax Highlighting:
* Added the remaining shader types
* Some comment and link fixes.
Diffstat (limited to 'source/blender/editors/space_text')
| -rw-r--r-- | source/blender/editors/space_text/text_format_osl.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/source/blender/editors/space_text/text_format_osl.c b/source/blender/editors/space_text/text_format_osl.c index 38903d65ec0..a815fb2c34d 100644 --- a/source/blender/editors/space_text/text_format_osl.c +++ b/source/blender/editors/space_text/text_format_osl.c @@ -24,7 +24,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/editors/space_text/text_format_py.c +/** \file blender/editors/space_text/text_format_osl.c * \ingroup sptext */ @@ -44,8 +44,8 @@ static int txtfmt_osl_find_builtinfunc(const char *string) { int i, len; - /* list is from... - * XXX - link to docs! + /* list is from + * https://github.com/imageworks/OpenShadingLanguage/raw/master/src/doc/osl-languagespec.pdf */ if (STR_LITERAL_STARTSWITH(string, "break", len)) i = len; else if (STR_LITERAL_STARTSWITH(string, "closure", len)) i = len; @@ -83,7 +83,7 @@ static int txtfmt_osl_find_reserved(const char *string) { int i, len; /* list is from... - * XXX - link to docs! + * https://github.com/imageworks/OpenShadingLanguage/raw/master/src/doc/osl-languagespec.pdf */ if (STR_LITERAL_STARTSWITH(string, "bool", len)) i = len; else if (STR_LITERAL_STARTSWITH(string, "case", len)) i = len; @@ -129,7 +129,7 @@ static int txtfmt_osl_find_reserved(const char *string) return i; } -/* Checks the specified source string for a Python special name. This name must +/* Checks the specified source string for a OSL special name. This name must * start at the beginning of the source string and must be followed by a non- * identifier (see text_check_identifier(char)) or null character. * @@ -139,8 +139,12 @@ static int txtfmt_osl_find_reserved(const char *string) static int txtfmt_osl_find_specialvar(const char *string) { int i, len; - - if (STR_LITERAL_STARTSWITH(string, "shader", len)) i = len; + + /* OSL shader types */ + if (STR_LITERAL_STARTSWITH(string, "shader", len)) i = len; + else if (STR_LITERAL_STARTSWITH(string, "surface", len)) i = len; + else if (STR_LITERAL_STARTSWITH(string, "volume", len)) i = len; + else if (STR_LITERAL_STARTSWITH(string, "displacement", len)) i = len; else i = 0; /* If next source char is an identifier (eg. 'i' in "definate") no match */ |