diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:10:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:11:45 +0300 |
| commit | 0911acb5cf49c5ba05b1df045b41697704aa288a (patch) | |
| tree | 9e6a84f0592cbd3b1066339538ae95289cf2eb08 /source/blender/gpu/intern/gpu_material.c | |
| parent | 5b643018348280ee601a20fb9329d5a313c23446 (diff) | |
| parent | 6654e109df952be3a3128fae2508a02c196ae593 (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 1d3c1d13be3..7b3750c970b 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -87,7 +87,7 @@ struct GPUMaterial { const void *engine_type; /* attached engine type */ int options; /* to identify shader variations (shadow, probe, world background...) */ - + /* for creating the material */ ListBase nodes; GPUNodeLink *outlink; @@ -670,6 +670,6 @@ void GPU_materials_free(void) for (wo = G.main->world.first; wo; wo = wo->id.next) GPU_material_free(&wo->gpumaterial); - + GPU_material_free(&defmaterial.gpumaterial); } |