[Bf-blender-cvs] [4c3d4ebefc8] master: Cleanup: remove redundant ifdef check

Campbell Barton noreply at git.blender.org
Fri Jul 30 16:24:10 CEST 2021


Commit: 4c3d4ebefc8ac79911837b014c6dbb3e053e5dbe
Author: Campbell Barton
Date:   Sat Jul 31 00:15:23 2021 +1000
Branches: master
https://developer.blender.org/rB4c3d4ebefc8ac79911837b014c6dbb3e053e5dbe

Cleanup: remove redundant ifdef check

The define that was tested no longer exists.

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

M	source/blender/draw/intern/DRW_render.h

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

diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index cd8b6531037..1292eea4c12 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -195,15 +195,12 @@ void DRW_texture_free(struct GPUTexture *tex);
 
 /* Shaders */
 
-#ifndef __GPU_MATERIAL_H__
-/* FIXME: Meh avoid including all GPUMaterial. */
 typedef void (*GPUMaterialEvalCallbackFn)(struct GPUMaterial *mat,
                                           int options,
                                           const char **vert_code,
                                           const char **geom_code,
                                           const char **frag_lib,
                                           const char **defines);
-#endif
 
 struct GPUShader *DRW_shader_create_ex(
     const char *vert, const char *geom, const char *frag, const char *defines, const char *name);



More information about the Bf-blender-cvs mailing list