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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-12-18 04:14:51 +0300
committerCampbell Barton <ideasman42@gmail.com>2014-12-18 04:14:51 +0300
commit0ae4d7d4059d1f8f6d1a2adcaae988b14c628c9f (patch)
treefbbe46d0cb7fafda7c04bc51006f40551325b7f8 /source
parent3da1a75b742d12f5308fdcec2f47f065a99e8f24 (diff)
Fix for GPU_materials_free accessing NULL pointer
Diffstat (limited to 'source')
-rw-r--r--source/blender/gpu/intern/gpu_material.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index fcf3425e9c6..75a9572f54f 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -1736,7 +1736,7 @@ void GPU_materials_free(void)
GPU_material_free(&ma->gpumaterial);
for (wo=G.main->world.first; wo; wo=wo->id.next)
- GPU_material_free(&ma->gpumaterial);
+ GPU_material_free(&wo->gpumaterial);
GPU_material_free(&defmaterial.gpumaterial);