Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2015-01-24 15:25:49 +0300
committerNicholas Bishop <nicholasbishop@gmail.com>2015-01-26 18:34:39 +0300
commit8cafa0afa67c2d027fbd241b3cf3959571a43160 (patch)
treed044018e770f58de9e0f0e56898d19b178ff7e53 /source/blender/gpu/intern/gpu_codegen.h
parentd1e1fb2239372ecd1e7ec0bb84e4d2c6cb0a1269 (diff)
Code cleanup: give anomymous enum used for CustomData.type a name
Used this in GPU module to clarify what some "ints" really are. Reviewed By: campbellbarton Differential Revision: https://developer.blender.org/D1026
Diffstat (limited to 'source/blender/gpu/intern/gpu_codegen.h')
-rw-r--r--source/blender/gpu/intern/gpu_codegen.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h
index a0698235db6..cf9f4cc9c1b 100644
--- a/source/blender/gpu/intern/gpu_codegen.h
+++ b/source/blender/gpu/intern/gpu_codegen.h
@@ -33,6 +33,7 @@
#ifndef __GPU_CODEGEN_H__
#define __GPU_CODEGEN_H__
+#include "DNA_customdata_types.h"
#include "DNA_listBase.h"
#include "GPU_material.h"
#include "GPU_glew.h"
@@ -89,7 +90,7 @@ struct GPUNode {
struct GPUNodeLink {
GPUNodeStack *socket;
- int attribtype;
+ CustomDataType attribtype;
const char *attribname;
int image;
@@ -153,7 +154,7 @@ typedef struct GPUInput {
float vec[16]; /* vector data */
GPUNodeLink *link;
int dynamictex; /* dynamic? */
- int attribtype; /* attribute type */
+ CustomDataType attribtype; /* attribute type */
char attribname[32]; /* attribute name */
int attribfirst; /* this is the first one that is bound */
GPUBuiltin builtin; /* builtin uniform */