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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2020-02-06 15:05:45 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-02-06 15:36:39 +0300
commit62ca9bcd0a7ff6fe52e359521369fc8b063d082a (patch)
tree7aae08f2a67b3ca12e01e524e3759ae226adf936 /source/blender/gpu/intern/gpu_material.c
parentdd00e8ecd642cafc6294ec7f0f31c5e0e0fe9870 (diff)
Cleanup: refactor default materials and shader nodes
Diffstat (limited to 'source/blender/gpu/intern/gpu_material.c')
-rw-r--r--source/blender/gpu/intern/gpu_material.c4
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 2e3a0a8df27..2f52aea2c91 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -40,6 +40,7 @@
#include "BLI_ghash.h"
#include "BKE_main.h"
+#include "BKE_material.h"
#include "BKE_node.h"
#include "BKE_scene.h"
@@ -778,7 +779,6 @@ void GPU_materials_free(Main *bmain)
{
Material *ma;
World *wo;
- extern Material defmaterial;
for (ma = bmain->materials.first; ma; ma = ma->id.next) {
GPU_material_free(&ma->gpumaterial);
@@ -788,5 +788,5 @@ void GPU_materials_free(Main *bmain)
GPU_material_free(&wo->gpumaterial);
}
- GPU_material_free(&defmaterial.gpumaterial);
+ BKE_material_defaults_free_gpu();
}