[Bf-blender-cvs] [1328d9a575d] temp-viewport-compositor-merge: Merge branch 'master' into temp-viewport-compositor-merge

[Omar Emara]

Commit: 1328d9a575d28a2756594f01a6ef162e1c5afb8e
Author: Omar Emara
Date:   Thu May 12 15:08:18 2022 +0200
Branches: temp-viewport-compositor-merge
https://developer.blender.org/rB1328d9a575d28a2756594f01a6ef162e1c5afb8e

Merge branch 'master' into temp-viewport-compositor-merge

===================================================================



===================================================================

diff --cc source/blender/gpu/intern/gpu_material.c
index 9253aae8404,7ec6ee5183a..e7337073773
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@@ -177,8 -175,8 +177,8 @@@ void GPU_material_free(ListBase *gpumat
  {
    LISTBASE_FOREACH (LinkData *, link, gpumaterial) {
      GPUMaterial *material = link->data;
-     GPU_material_free_single(material);
      DRW_deferred_shader_remove(material);
 -    gpu_material_free_single(material);
++    GPU_material_free_single(material);
    }
    BLI_freelistN(gpumaterial);
  }