archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Mode Engines: Fix MSVC compilation error.

Browse Source
This commit is contained in:
Clément Foucault
2017-03-13 11:39:41 +01:00
parent 7bc76f8a3c
commit ecce1fabca
11 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/draw/modes/edit_curve_mode.c
View File

@@ -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 {

6
source/blender/draw/modes/edit_lattice_mode.c
View File

@@ -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 {

6
source/blender/draw/modes/edit_metaball_mode.c
View File

@@ -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 {

6
source/blender/draw/modes/edit_surface_mode.c
View File

@@ -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 {

6
source/blender/draw/modes/edit_text_mode.c
View File

@@ -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 {

6
source/blender/draw/modes/paint_texture_mode.c
View File

@@ -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 {

6
source/blender/draw/modes/paint_vertex_mode.c
View File

@@ -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 {

6
source/blender/draw/modes/paint_weight_mode.c
View File

@@ -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 {

6
source/blender/draw/modes/particle_mode.c
View File

@@ -52,7 +52,7 @@ typedef struct PARTICLE_PassList {
typedef struct PARTICLE_FramebufferList {
/* Contains all framebuffer objects needed by this engine.
* Only contains (GPUFrameBuffer *) */
// struct GPUFrameBuffer *fb;
struct GPUFrameBuffer *fb;
} PARTICLE_FramebufferList;
/* keep it under MAX_TEXTURES */
@@ -60,7 +60,7 @@ typedef struct PARTICLE_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;
} PARTICLE_TextureList;
/* keep it under MAX_STORAGE */
@@ -69,7 +69,7 @@ typedef struct PARTICLE_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;
} PARTICLE_StorageList;
typedef struct PARTICLE_Data {

6
source/blender/draw/modes/pose_mode.c
View File

@@ -52,7 +52,7 @@ typedef struct POSE_PassList {
typedef struct POSE_FramebufferList {
/* Contains all framebuffer objects needed by this engine.
* Only contains (GPUFrameBuffer *) */
// struct GPUFrameBuffer *fb;
struct GPUFrameBuffer *fb;
} POSE_FramebufferList;
/* keep it under MAX_TEXTURES */
@@ -60,7 +60,7 @@ typedef struct POSE_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;
} POSE_TextureList;
/* keep it under MAX_STORAGE */
@@ -69,7 +69,7 @@ typedef struct POSE_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;
} POSE_StorageList;
typedef struct POSE_Data {

6
source/blender/draw/modes/sculpt_mode.c
View File

@@ -52,7 +52,7 @@ typedef struct SCULPT_PassList {
typedef struct SCULPT_FramebufferList {
/* Contains all framebuffer objects needed by this engine.
* Only contains (GPUFrameBuffer *) */
// struct GPUFrameBuffer *fb;
struct GPUFrameBuffer *fb;
} SCULPT_FramebufferList;
/* keep it under MAX_TEXTURES */
@@ -60,7 +60,7 @@ typedef struct SCULPT_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;
} SCULPT_TextureList;
/* keep it under MAX_STORAGE */
@@ -69,7 +69,7 @@ typedef struct SCULPT_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;
} SCULPT_StorageList;
typedef struct SCULPT_Data {