Merge branch 'master' into blender2.8
[blender.git] / source / blender / gpu / GPU_material.h
index c0b75748e1f8faa989c66b524aa9623261ada785..f77b62260be9e0ec8bbabb04a16a85f1477d7547 100644 (file)
@@ -277,6 +277,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: