diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/render/extern/include/RE_shader_ext.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/render/extern/include/RE_shader_ext.h')
-rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 5fc9431af3d..c5e3575d1f9 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -20,7 +20,6 @@ * \ingroup render */ - #ifndef __RE_SHADER_EXT_H__ #define __RE_SHADER_EXT_H__ @@ -31,14 +30,14 @@ /* localized texture result data */ /* note; tr tg tb ta has to remain in this order */ typedef struct TexResult { - float tin, tr, tg, tb, ta; - int talpha; - float *nor; + float tin, tr, tg, tb, ta; + int talpha; + float *nor; } TexResult; typedef struct BakeImBufuserData { - float *displacement_buffer; - char *mask_buffer; + float *displacement_buffer; + char *mask_buffer; } BakeImBufuserData; /* node shaders... */ @@ -51,7 +50,8 @@ struct Tex; /* this one uses nodes */ int multitex_ext(struct Tex *tex, float texvec[3], - float dxt[3], float dyt[3], + float dxt[3], + float dyt[3], int osatex, struct TexResult *texres, const short thread, @@ -59,9 +59,22 @@ int multitex_ext(struct Tex *tex, bool scene_color_manage, const bool skip_load_image); /* nodes disabled */ -int multitex_ext_safe(struct Tex *tex, float texvec[3], struct TexResult *texres, struct ImagePool *pool, bool scene_color_manage, const bool skip_load_image); +int multitex_ext_safe(struct Tex *tex, + float texvec[3], + struct TexResult *texres, + struct ImagePool *pool, + bool scene_color_manage, + const bool skip_load_image); /* only for internal node usage */ -int multitex_nodes(struct Tex *tex, float texvec[3], float dxt[3], float dyt[3], int osatex, struct TexResult *texres, - const short thread, short which_output, struct MTex *mtex, struct ImagePool *pool); +int multitex_nodes(struct Tex *tex, + float texvec[3], + float dxt[3], + float dyt[3], + int osatex, + struct TexResult *texres, + const short thread, + short which_output, + struct MTex *mtex, + struct ImagePool *pool); #endif /* __RE_SHADER_EXT_H__ */ |