diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-09-21 00:05:27 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-09-23 17:02:23 +0300 |
| commit | cec28ebf5efe75ead30080275e2a0e0118bbbdf4 (patch) | |
| tree | 435cf7e6d14bb48531f3f7bd76673352e3843322 | |
| parent | 3c30467cda84ef19d90a3fb9748a24b8ab8e5f11 (diff) | |
Fix T46050: blender internal geometry node UV not working inside node group.
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index fa0d34b8db6..3e7e98b4a1d 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1078,7 +1078,10 @@ static void do_init_render_material(Material *ma, int r_mode, float *amb) static void init_render_nodetree(bNodeTree *ntree, Material *basemat, int r_mode, float *amb) { bNode *node; - + + /* parses the geom+tex nodes */ + ntreeShaderGetTexcoMode(ntree, r_mode, &basemat->texco, &basemat->mode_l); + for (node = ntree->nodes.first; node; node = node->next) { if (node->id) { if (GS(node->id->name) == ID_MA) { @@ -1115,9 +1118,6 @@ void init_render_material(Material *mat, int r_mode, float *amb) mat->mode_l = (mat->mode & MA_MODE_PIPELINE) | MA_SHLESS; mat->mode2_l = mat->mode2 & MA_MODE2_PIPELINE; - /* parses the geom+tex nodes */ - ntreeShaderGetTexcoMode(mat->nodetree, r_mode, &mat->texco, &mat->mode_l); - init_render_nodetree(mat->nodetree, mat, r_mode, amb); if (!mat->nodetree->execdata) |