[Bf-blender-cvs] [ecce1fabca7] blender2.8: Mode Engines: Fix MSVC compilation error.
Clément Foucault
noreply at git.blender.org
Mon Mar 13 11:33:06 CET 2017
Commit: ecce1fabca7fbc7551d6b706663f44662719ec1f
Author: Clément Foucault
Date: Mon Mar 13 11:39:41 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBecce1fabca7fbc7551d6b706663f44662719ec1f
Mode Engines: Fix MSVC compilation error.
===================================================================
M source/blender/draw/modes/edit_curve_mode.c
M source/blender/draw/modes/edit_lattice_mode.c
M source/blender/draw/modes/edit_metaball_mode.c
M source/blender/draw/modes/edit_surface_mode.c
M source/blender/draw/modes/edit_text_mode.c
M source/blender/draw/modes/paint_texture_mode.c
M source/blender/draw/modes/paint_vertex_mode.c
M source/blender/draw/modes/paint_weight_mode.c
M source/blender/draw/modes/particle_mode.c
M source/blender/draw/modes/pose_mode.c
M source/blender/draw/modes/sculpt_mode.c
===================================================================
diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c
index acf36c29174..d030a56fee2 100644
--- a/source/blender/draw/modes/edit_curve_mode.c
+++ b/source/blender/draw/modes/edit_curve_mode.c
@@ -52,7 +52,7 @@ typedef struct EDIT_CURVE_PassList {
typedef struct EDIT_CURVE_FramebufferList {
/* Contains all framebuffer objects needed by this engine.
* Only contains (GPUFrameBuffer *) */
- // struct GPUFrameBuffer *fb;
+ struct GPUFrameBuffer *fb;
} EDIT_CURVE_FramebufferList;
/* keep it under MAX_TEXTURES */
@@ -60,7 +60,7 @@ typedef struct EDIT_CURVE_TextureList {
/* Contains all framebuffer textures / utility textures
* needed by this engine. Only viewport specific textures
* (not per object). Only contains (GPUTexture *) */
- // struct GPUTexture *texture;
+ struct GPUTexture *texture;
} EDIT_CURVE_TextureList;
/* keep it under MAX_STORAGE */
@@ -69,7 +69,7 @@ typedef struct EDIT_CURVE_StorageList {
* Only directly MEM_(m/c)allocN'ed blocks because they are
* free with MEM_freeN() when viewport is freed.
* (not per object) */
- // struct CustomStruct *block;
+ struct CustomStruct *block;
} EDIT_CURVE_StorageList;
typedef struct EDIT_CURVE_Data {
diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c
index 219b70cf139..32c95db1574 100644
--- a/source/blender/draw/modes/edit_lattice_mode.c
+++ b/source/blender/draw/modes/edit_lattice_mode.c
@@ -52,7 +52,7 @@ typedef struct EDIT_LATTICE_PassList {
typedef struct EDIT_LATTICE_FramebufferList {
/* Contains all framebuffer objects needed by this engine.
* Only contains (GPUFrameBuffer *) */
- // struct GPUFrameBuffer *fb;
+ struct GPUFrameBuffer *fb;
} EDIT_LATTICE_FramebufferList;
/* keep it under MAX_TEXTURES */
@@ -60,7 +60,7 @@ typedef struct EDIT_LATTICE_TextureList {
/* Contains all framebuffer textures / utility textures
* needed by this engine. Only viewport specific textures
* (not per object). Only contains (GPUTexture *) */
- // struct GPUTexture *texture;
+ struct GPUTexture *texture;
} EDIT_LATTICE_TextureList;
/* keep it under MAX_STORAGE */
@@ -69,7 +69,7 @@ typedef struct EDIT_LATTICE_StorageList {
* Only directly MEM_(m/c)allocN'ed blocks because they are
* free with MEM_freeN() when viewport is freed.
* (not per object) */
- // struct CustomStruct *block;
+ struct CustomStruct *block;
} EDIT_LATTICE_StorageList;
typedef struct EDIT_LATTICE_Data {
diff --git a/source/blender/draw/modes/edit_metaball_mode.c b/source/blender/draw/modes/edit_metaball_mode.c
index 0f314f355c0..e29fab4dd00 100644
--- a/source/blender/draw/modes/edit_metaball_mode.c
+++ b/source/blender/draw/modes/edit_metaball_mode.c
@@ -52,7 +52,7 @@ typedef struct EDIT_METABALL_PassList {
typedef struct EDIT_METABALL_FramebufferList {
/* Contains all framebuffer objects needed by this engine.
* Only contains (GPUFrameBuffer *) */
- // struct GPUFrameBuffer *fb;
+ struct GPUFrameBuffer *fb;
} EDIT_METABALL_FramebufferList;
/* keep it under MAX_TEXTURES */
@@ -60,7 +60,7 @@ typedef struct EDIT_METABALL_TextureList {
/* Contains all framebuffer textures / utility textures
* needed by this engine. Only viewport specific textures
* (not per object). Only contains (GPUTexture *) */
- // struct GPUTexture *texture;
+ struct GPUTexture *texture;
} EDIT_METABALL_TextureList;
/* keep it under MAX_STORAGE */
@@ -69,7 +69,7 @@ typedef struct EDIT_METABALL_StorageList {
* Only directly MEM_(m/c)allocN'ed blocks because they are
* free with MEM_freeN() when viewport is freed.
* (not per object) */
- // struct CustomStruct *block;
+ struct CustomStruct *block;
} EDIT_METABALL_StorageList;
typedef struct EDIT_METABALL_Data {
diff --git a/source/blender/draw/modes/edit_surface_mode.c b/source/blender/draw/modes/edit_surface_mode.c
index e320a7c8b36..9783443ead2 100644
--- a/source/blender/draw/modes/edit_surface_mode.c
+++ b/source/blender/draw/modes/edit_surface_mode.c
@@ -52,7 +52,7 @@ typedef struct EDIT_SURFACE_PassList {
typedef struct EDIT_SURFACE_FramebufferList {
/* Contains all framebuffer objects needed by this engine.
* Only contains (GPUFrameBuffer *) */
- // struct GPUFrameBuffer *fb;
+ struct GPUFrameBuffer *fb;
} EDIT_SURFACE_FramebufferList;
/* keep it under MAX_TEXTURES */
@@ -60,7 +60,7 @@ typedef struct EDIT_SURFACE_TextureList {
/* Contains all framebuffer textures / utility textures
* needed by this engine. Only viewport specific textures
* (not per object). Only contains (GPUTexture *) */
- // struct GPUTexture *texture;
+ struct GPUTexture *texture;
} EDIT_SURFACE_TextureList;
/* keep it under MAX_STORAGE */
@@ -69,7 +69,7 @@ typedef struct EDIT_SURFACE_StorageList {
* Only directly MEM_(m/c)allocN'ed blocks because they are
* free with MEM_freeN() when viewport is freed.
* (not per object) */
- // struct CustomStruct *block;
+ struct CustomStruct *block;
} EDIT_SURFACE_StorageList;
typedef struct EDIT_SURFACE_Data {
diff --git a/source/blender/draw/modes/edit_text_mode.c b/source/blender/draw/modes/edit_text_mode.c
index 13e8744a339..389d38b3df8 100644
--- a/source/blender/draw/modes/edit_text_mode.c
+++ b/source/blender/draw/modes/edit_text_mode.c
@@ -52,7 +52,7 @@ typedef struct EDIT_TEXT_PassList {
typedef struct EDIT_TEXT_FramebufferList {
/* Contains all framebuffer objects needed by this engine.
* Only contains (GPUFrameBuffer *) */
- // struct GPUFrameBuffer *fb;
+ struct GPUFrameBuffer *fb;
} EDIT_TEXT_FramebufferList;
/* keep it under MAX_TEXTURES */
@@ -60,7 +60,7 @@ typedef struct EDIT_TEXT_TextureList {
/* Contains all framebuffer textures / utility textures
* needed by this engine. Only viewport specific textures
* (not per object). Only contains (GPUTexture *) */
- // struct GPUTexture *texture;
+ struct GPUTexture *texture;
} EDIT_TEXT_TextureList;
/* keep it under MAX_STORAGE */
@@ -69,7 +69,7 @@ typedef struct EDIT_TEXT_StorageList {
* Only directly MEM_(m/c)allocN'ed blocks because they are
* free with MEM_freeN() when viewport is freed.
* (not per object) */
- // struct CustomStruct *block;
+ struct CustomStruct *block;
} EDIT_TEXT_StorageList;
typedef struct EDIT_TEXT_Data {
diff --git a/source/blender/draw/modes/paint_texture_mode.c b/source/blender/draw/modes/paint_texture_mode.c
index 99046fe2c1c..cd84ddc7e30 100644
--- a/source/blender/draw/modes/paint_texture_mode.c
+++ b/source/blender/draw/modes/paint_texture_mode.c
@@ -52,7 +52,7 @@ typedef struct PAINT_TEXTURE_PassList {
typedef struct PAINT_TEXTURE_FramebufferList {
/* Contains all framebuffer objects needed by this engine.
* Only contains (GPUFrameBuffer *) */
- // struct GPUFrameBuffer *fb;
+ struct GPUFrameBuffer *fb;
} PAINT_TEXTURE_FramebufferList;
/* keep it under MAX_TEXTURES */
@@ -60,7 +60,7 @@ typedef struct PAINT_TEXTURE_TextureList {
/* Contains all framebuffer textures / utility textures
* needed by this engine. Only viewport specific textures
* (not per object). Only contains (GPUTexture *) */
- // struct GPUTexture *texture;
+ struct GPUTexture *texture;
} PAINT_TEXTURE_TextureList;
/* keep it under MAX_STORAGE */
@@ -69,7 +69,7 @@ typedef struct PAINT_TEXTURE_StorageList {
* Only directly MEM_(m/c)allocN'ed blocks because they are
* free with MEM_freeN() when viewport is freed.
* (not per object) */
- // struct CustomStruct *block;
+ struct CustomStruct *block;
} PAINT_TEXTURE_StorageList;
typedef struct PAINT_TEXTURE_Data {
diff --git a/source/blender/draw/modes/paint_vertex_mode.c b/source/blender/draw/modes/paint_vertex_mode.c
index 051ee48ec10..7bf905fb90f 100644
--- a/source/blender/draw/modes/paint_vertex_mode.c
+++ b/source/blender/draw/modes/paint_vertex_mode.c
@@ -52,7 +52,7 @@ typedef struct PAINT_VERTEX_PassList {
typedef struct PAINT_VERTEX_FramebufferList {
/* Contains all framebuffer objects needed by this engine.
* Only contains (GPUFrameBuffer *) */
- // struct GPUFrameBuffer *fb;
+ struct GPUFrameBuffer *fb;
} PAINT_VERTEX_FramebufferList;
/* keep it under MAX_TEXTURES */
@@ -60,7 +60,7 @@ typedef struct PAINT_VERTEX_TextureList {
/* Contains all framebuffer textures / utility textures
* needed by this engine. Only viewport specific textures
* (not per object). Only contains (GPUTexture *) */
- // struct GPUTexture *texture;
+ struct GPUTexture *texture;
} PAINT_VERTEX_TextureList;
/* keep it under MAX_STORAGE */
@@ -69,7 +69,7 @@ typedef struct PAINT_VERTEX_StorageList {
* Only directly MEM_(m/c)allocN'ed blocks because they are
* free with MEM_freeN() when viewport is freed.
* (not per object) */
- // struct CustomStruct *block;
+ struct CustomStruct *block;
} PAINT_VERTEX_StorageList;
typedef struct PAINT_VERTEX_Data {
diff --git a/source/blender/draw/modes/paint_weight_mode.c b/source/blender/draw/modes/paint_weight_mode.c
index d5cfae88bfe..e90f29a5434 100644
--- a/source/blender/draw/modes/paint_weight_mode.c
+++ b/source/blender/draw/modes/paint_weight_mode.c
@@ -52,7 +52,7 @@ typedef struct PAINT_WEIGHT_PassList {
typedef struct PAINT_WEIGHT_FramebufferList {
/* Contains all framebuffer objects needed by this engine.
* Only contains (GPUFrameBuffer *) */
- // struct GPUFrameBuffer *fb;
+ struct GPUFrameBuffer *fb;
} PAINT_WEIGHT_FramebufferList;
/* keep it under MAX_TEXTURES */
@@ -60,7 +60,7 @@ typedef struct PAINT_WEIGHT_TextureList {
/* Contains all framebuffer textures / utility textures
* needed by this engine. Only viewport specific textures
* (not per object). Only contains (GPUTexture *) */
- // struct GPUTexture *texture;
+ struct GPUTexture *texture;
} PAINT_WEIGHT_TextureList;
/* keep it under MAX_STORAGE */
@@ -69,7 +69,7 @@ typedef struct PAINT_WEIGHT_StorageList {
* Only directly MEM_(m/c)allocN'ed blocks because they are
* free with MEM_freeN() when viewport is freed.
* (not per object) */
- // struct CustomStruct *block;
+ struct CustomStruct *block;
} PAINT_WEIGHT_StorageList;
typedef struct PAINT_WEIGHT_Data {
diff --git a/source/blender/draw/modes/particle_mode.c b/source/blender/draw/modes/particle_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list