diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-11-09 19:46:53 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-11-09 19:46:53 +0400 |
| commit | 1b4a54ad73c058baa59ffdc9e5f18b0b79030fb0 (patch) | |
| tree | a5b84d392ea14b0d760a5e24f7a8e51f203d558c /source/blender/nodes/shader/node_shader_util.h | |
| parent | edec46b0a6aac18f406991b9e16228d4bd848c61 (diff) | |
| parent | bc5ec4e69cf3308c2563239c0e8372b853800a78 (diff) | |
Merge with trunk r41701soc-2011-carrot
Diffstat (limited to 'source/blender/nodes/shader/node_shader_util.h')
| -rw-r--r-- | source/blender/nodes/shader/node_shader_util.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h index 0437ba0c14b..48e54d9d0b4 100644 --- a/source/blender/nodes/shader/node_shader_util.h +++ b/source/blender/nodes/shader/node_shader_util.h @@ -40,6 +40,7 @@ #include "MEM_guardedalloc.h" #include "DNA_color_types.h" +#include "DNA_customdata_types.h" #include "DNA_ID.h" #include "DNA_image_types.h" #include "DNA_material_types.h" @@ -123,6 +124,7 @@ void nodestack_get_vec(float *in, short type_in, bNodeStack *ns); void node_gpu_stack_from_data(struct GPUNodeStack *gs, int type, struct bNodeStack *ns); void node_data_from_gpu_stack(struct bNodeStack *ns, struct GPUNodeStack *gs); +void node_shader_gpu_tex_mapping(struct GPUMaterial *mat, struct bNode *node, struct GPUNodeStack *in, struct GPUNodeStack *out); void ntreeExecGPUNodes(struct bNodeTreeExec *exec, struct GPUMaterial *mat, int do_outputs); |