[Bf-blender-cvs] [92e5dfbeed] clay-engine: Fix compilation error on windows

Clément Foucault noreply at git.blender.org
Thu Jan 26 18:34:25 CET 2017


Commit: 92e5dfbeed170deedae60df7fb66cb3bdd66a6f7
Author: Clément Foucault
Date:   Thu Jan 26 18:33:24 2017 +0100
Branches: clay-engine
https://developer.blender.org/rB92e5dfbeed170deedae60df7fb66cb3bdd66a6f7

Fix compilation error on windows

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

M	source/blender/draw/engines/clay/clay.c
M	source/blender/gpu/GPU_viewport.h

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

diff --git a/source/blender/draw/engines/clay/clay.c b/source/blender/draw/engines/clay/clay.c
index a6b6fc95d5..ffdad41bef 100644
--- a/source/blender/draw/engines/clay/clay.c
+++ b/source/blender/draw/engines/clay/clay.c
@@ -111,12 +111,14 @@ typedef struct CLAY_TextureList{
 
 /* keep it under MAX_PASSES */
 typedef struct CLAY_PassList{
+	/* default */
+	struct DRWPass *non_meshes_pass;
+	struct DRWPass *ob_center_pass;
+	/* engine specific */
 	struct DRWPass *depth_pass;
 	struct DRWPass *clay_pass;
 	struct DRWPass *wire_overlay_pass;
 	struct DRWPass *wire_outline_pass;
-	struct DRWPass *non_meshes_pass;
-	struct DRWPass *ob_center_pass;
 } CLAY_PassList;
 
 //#define GTAO
diff --git a/source/blender/gpu/GPU_viewport.h b/source/blender/gpu/GPU_viewport.h
index fca77ea0b6..e44657a464 100644
--- a/source/blender/gpu/GPU_viewport.h
+++ b/source/blender/gpu/GPU_viewport.h
@@ -69,10 +69,8 @@ typedef struct DefaultTextureList {
 } DefaultTextureList;
 
 typedef struct DefaultPassList {
-	/* Put Default passes here
-	 * - Edit Wire
-	 * - Active objects outlines
-	 * ... */
+	struct DRWPass *non_meshes_pass;
+	struct DRWPass *ob_center_pass;
 } DefaultPassList;
 
 GPUViewport *GPU_viewport_create(void);




More information about the Bf-blender-cvs mailing list