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:
authorSebastian Ullrich <>2016-05-21 17:13:09 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-05-21 17:46:42 +0300
commit6bd248cd65405854abafe9fb2201f3785d5259af (patch)
tree040e3782cc846f100ce9611aff339c50f1d8488f /source/blender/python
parent4bbc0731a0ad144756bc403308052e9744939a86 (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/python')
-rw-r--r--source/blender/python/intern/gpu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/python/intern/gpu.c b/source/blender/python/intern/gpu.c
index 66c1ddcc352..c3bb588f7eb 100644
--- a/source/blender/python/intern/gpu.c
+++ b/source/blender/python/intern/gpu.c
@@ -261,6 +261,9 @@ static PyObject *GPU_export_shader(PyObject *UNUSED(self), PyObject *args, PyObj
if (uniform->lamp) {
PY_DICT_ADD_ID(dict, uniform, lamp);
}
+ if (uniform->material) {
+ PY_DICT_ADD_ID(dict, uniform, material);
+ }
if (uniform->image) {
PY_DICT_ADD_ID(dict, uniform, image);
}