diff options
| author | Sebastian Ullrich <> | 2016-05-21 17:13:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-21 17:46:42 +0300 |
| commit | 6bd248cd65405854abafe9fb2201f3785d5259af (patch) | |
| tree | 040e3782cc846f100ce9611aff339c50f1d8488f /source/blender/gpu/GPU_material.h | |
| parent | 4bbc0731a0ad144756bc403308052e9744939a86 (diff) | |
Python API: add material to uniforms from gpu.export_shader.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D1457
Diffstat (limited to 'source/blender/gpu/GPU_material.h')
| -rw-r--r-- | source/blender/gpu/GPU_material.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index 81b08e2b128..fc2ca16db59 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -282,6 +282,7 @@ typedef struct GPUInputUniform { GPUDataType datatype; /* type of uniform data */ struct Object *lamp; /* when type=GPU_DYNAMIC_LAMP_... or GPU_DYNAMIC_SAMPLER_2DSHADOW */ struct Image *image; /* when type=GPU_DYNAMIC_SAMPLER_2DIMAGE */ + struct Material *material;/* when type=GPU_DYNAMIC_MAT_... */ int texnumber; /* when type=GPU_DYNAMIC_SAMPLER, texture number: 0.. */ unsigned char *texpixels; /* for internally generated texture, pixel data in RGBA format */ int texsize; /* size in pixel of the texture in texpixels buffer: |