diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-07-28 05:00:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-28 05:00:58 +0300 |
| commit | 251349c3c2269fff915d1bb85911211563493071 (patch) | |
| tree | 35524bdb77d583562227ee11b1ff516ea278e00e /source/blender/gpu/intern/gpu_material.c | |
| parent | b1532493c27b08444745cef348641f3a0e899ba8 (diff) | |
| parent | a27acefd0c89aab63a6c243a844e2790dfad961a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/intern/gpu_material.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 00af1991eaf..60df9e87cc0 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -257,6 +257,9 @@ static int GPU_material_construct_end(GPUMaterial *material, const char *passnam material->cameratexcofacloc = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_CAMERA_TEXCO_FACTORS)); return 1; } + else { + GPU_pass_free_nodes(&material->nodes); + } return 0; } |