blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 752 Projects 19 Wiki Activity

Cleanup: warnings

This commit is contained in:
Campbell Barton 2017-03-14 18:40:23 +11:00
parent 3ee0723b7d
commit 91837cd5b0
12 changed files with 156 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/modes/edit_armature_mode.c
View File

@ -104,11 +104,13 @@ static void EDIT_ARMATURE_draw_scene(void)
DRW_draw_pass(psl->relationship);
}
#if 0
void EDIT_ARMATURE_collection_settings_create(CollectionEngineSettings *ces)
{
BLI_assert(ces);
//BKE_collection_engine_property_add_int(ces, "show_occlude_wire", false);
}
#endif
DrawEngineType draw_engine_edit_armature_type = {
NULL, NULL,

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

@ -110,14 +110,16 @@ static EDIT_CURVE_Data *vedata;
/* Init Textures, Framebuffers, Storage and Shaders.
* It is called for every frames.
* (Optionnal) */
* (Optional) */
static void EDIT_CURVE_engine_init(void)
{
EDIT_CURVE_Data *vedata = DRW_viewport_engine_data_get("EditCurveMode");
vedata = DRW_viewport_engine_data_get("EditCurveMode");
EDIT_CURVE_TextureList *txl = vedata->txl;
EDIT_CURVE_FramebufferList *fbl = vedata->fbl;
EDIT_CURVE_StorageList *stl = vedata->stl;
UNUSED_VARS(txl, fbl, stl);
/* Init Framebuffers like this: order is attachment order (for color texs) */
/*
* DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24},
@ -146,6 +148,8 @@ static void EDIT_CURVE_cache_init(void)
EDIT_CURVE_PassList *psl = vedata->psl;
EDIT_CURVE_StorageList *stl = vedata->stl;
UNUSED_VARS(stl);
{
/* Create a pass */
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
@ -173,6 +177,8 @@ static void EDIT_CURVE_cache_populate(Object *ob)
EDIT_CURVE_PassList *psl = vedata->psl;
EDIT_CURVE_StorageList *stl = vedata->stl;
UNUSED_VARS(psl, stl);
if (ob->type == OB_MESH) {
/* Get geometry cache */
struct Batch *geom = DRW_cache_surface_get(ob);
@ -182,13 +188,14 @@ static void EDIT_CURVE_cache_populate(Object *ob)
}
}
/* Optionnal : Post-cache_populate callback */
/* Optional: Post-cache_populate callback */
static void EDIT_CURVE_cache_finish(void)
{
EDIT_CURVE_PassList *psl = vedata->psl;
EDIT_CURVE_StorageList *stl = vedata->stl;
/* Do something here! dependant on the objects gathered */
UNUSED_VARS(psl, stl);
}
/* Draw time ! Control rendering pipeline from here */
@ -202,6 +209,8 @@ static void EDIT_CURVE_draw_scene(void)
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
UNUSED_VARS(fbl, dfbl, dtxl);
/* Show / hide entire passes, swap framebuffers ... whatever you fancy */
/*
* DRW_framebuffer_texture_detach(dtxl->depth);
@ -238,6 +247,7 @@ static void EDIT_CURVE_engine_free(void)
* source/blender/makesrna/intern/rna_scene.c
* source/blender/blenkernel/intern/layer.c
*/
#if 0
void EDIT_CURVE_collection_settings_create(CollectionEngineSettings *ces)
{
BLI_assert(ces);
@ -245,6 +255,7 @@ void EDIT_CURVE_collection_settings_create(CollectionEngineSettings *ces)
// BKE_collection_engine_property_add_int(ces, "my_int_prop", 0);
// BKE_collection_engine_property_add_float(ces, "my_float_prop", 0.0f);
}
#endif
DrawEngineType draw_engine_edit_curve_type = {
NULL, NULL,

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

@ -110,14 +110,16 @@ static EDIT_LATTICE_Data *vedata;
/* Init Textures, Framebuffers, Storage and Shaders.
* It is called for every frames.
* (Optionnal) */
* (Optional) */
static void EDIT_LATTICE_engine_init(void)
{
EDIT_LATTICE_Data *vedata = DRW_viewport_engine_data_get("EditLatticeMode");
vedata = DRW_viewport_engine_data_get("EditLatticeMode");
EDIT_LATTICE_TextureList *txl = vedata->txl;
EDIT_LATTICE_FramebufferList *fbl = vedata->fbl;
EDIT_LATTICE_StorageList *stl = vedata->stl;
UNUSED_VARS(txl, fbl, stl);
/* Init Framebuffers like this: order is attachment order (for color texs) */
/*
* DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24},
@ -146,6 +148,8 @@ static void EDIT_LATTICE_cache_init(void)
EDIT_LATTICE_PassList *psl = vedata->psl;
EDIT_LATTICE_StorageList *stl = vedata->stl;
UNUSED_VARS(stl);
{
/* Create a pass */
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
@ -173,6 +177,8 @@ static void EDIT_LATTICE_cache_populate(Object *ob)
EDIT_LATTICE_PassList *psl = vedata->psl;
EDIT_LATTICE_StorageList *stl = vedata->stl;
UNUSED_VARS(psl, stl);
if (ob->type == OB_MESH) {
/* Get geometry cache */
struct Batch *geom = DRW_cache_surface_get(ob);
@ -182,13 +188,14 @@ static void EDIT_LATTICE_cache_populate(Object *ob)
}
}
/* Optionnal : Post-cache_populate callback */
/* Optional: Post-cache_populate callback */
static void EDIT_LATTICE_cache_finish(void)
{
EDIT_LATTICE_PassList *psl = vedata->psl;
EDIT_LATTICE_StorageList *stl = vedata->stl;
/* Do something here! dependant on the objects gathered */
UNUSED_VARS(psl, stl);
}
/* Draw time ! Control rendering pipeline from here */
@ -202,6 +209,8 @@ static void EDIT_LATTICE_draw_scene(void)
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
UNUSED_VARS(fbl, dfbl, dtxl);
/* Show / hide entire passes, swap framebuffers ... whatever you fancy */
/*
* DRW_framebuffer_texture_detach(dtxl->depth);
@ -238,6 +247,7 @@ static void EDIT_LATTICE_engine_free(void)
* source/blender/makesrna/intern/rna_scene.c
* source/blender/blenkernel/intern/layer.c
*/
#if 0
void EDIT_LATTICE_collection_settings_create(CollectionEngineSettings *ces)
{
BLI_assert(ces);
@ -245,6 +255,7 @@ void EDIT_LATTICE_collection_settings_create(CollectionEngineSettings *ces)
// BKE_collection_engine_property_add_int(ces, "my_int_prop", 0);
// BKE_collection_engine_property_add_float(ces, "my_float_prop", 0.0f);
}
#endif
DrawEngineType draw_engine_edit_lattice_type = {
NULL, NULL,

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

@ -110,14 +110,16 @@ static EDIT_METABALL_Data *vedata;
/* Init Textures, Framebuffers, Storage and Shaders.
* It is called for every frames.
* (Optionnal) */
* (Optional) */
static void EDIT_METABALL_engine_init(void)
{
EDIT_METABALL_Data *vedata = DRW_viewport_engine_data_get("EditMetaballMode");
vedata = DRW_viewport_engine_data_get("EditMetaballMode");
EDIT_METABALL_TextureList *txl = vedata->txl;
EDIT_METABALL_FramebufferList *fbl = vedata->fbl;
EDIT_METABALL_StorageList *stl = vedata->stl;
UNUSED_VARS(txl, fbl, stl);
/* Init Framebuffers like this: order is attachment order (for color texs) */
/*
* DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24},
@ -146,6 +148,8 @@ static void EDIT_METABALL_cache_init(void)
EDIT_METABALL_PassList *psl = vedata->psl;
EDIT_METABALL_StorageList *stl = vedata->stl;
UNUSED_VARS(stl);
{
/* Create a pass */
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
@ -173,6 +177,8 @@ static void EDIT_METABALL_cache_populate(Object *ob)
EDIT_METABALL_PassList *psl = vedata->psl;
EDIT_METABALL_StorageList *stl = vedata->stl;
UNUSED_VARS(psl, stl);
if (ob->type == OB_MESH) {
/* Get geometry cache */
struct Batch *geom = DRW_cache_surface_get(ob);
@ -182,13 +188,14 @@ static void EDIT_METABALL_cache_populate(Object *ob)
}
}
/* Optionnal : Post-cache_populate callback */
/* Optional: Post-cache_populate callback */
static void EDIT_METABALL_cache_finish(void)
{
EDIT_METABALL_PassList *psl = vedata->psl;
EDIT_METABALL_StorageList *stl = vedata->stl;
/* Do something here! dependant on the objects gathered */
UNUSED_VARS(psl, stl);
}
/* Draw time ! Control rendering pipeline from here */
@ -202,6 +209,8 @@ static void EDIT_METABALL_draw_scene(void)
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
UNUSED_VARS(fbl, dfbl, dtxl);
/* Show / hide entire passes, swap framebuffers ... whatever you fancy */
/*
* DRW_framebuffer_texture_detach(dtxl->depth);
@ -238,6 +247,7 @@ static void EDIT_METABALL_engine_free(void)
* source/blender/makesrna/intern/rna_scene.c
* source/blender/blenkernel/intern/layer.c
*/
#if 0
void EDIT_METABALL_collection_settings_create(CollectionEngineSettings *ces)
{
BLI_assert(ces);
@ -245,6 +255,7 @@ void EDIT_METABALL_collection_settings_create(CollectionEngineSettings *ces)
// BKE_collection_engine_property_add_int(ces, "my_int_prop", 0);
// BKE_collection_engine_property_add_float(ces, "my_float_prop", 0.0f);
}
#endif
DrawEngineType draw_engine_edit_metaball_type = {
NULL, NULL,

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

@ -110,14 +110,16 @@ static EDIT_SURFACE_Data *vedata;
/* Init Textures, Framebuffers, Storage and Shaders.
* It is called for every frames.
* (Optionnal) */
* (Optional) */
static void EDIT_SURFACE_engine_init(void)
{
EDIT_SURFACE_Data *vedata = DRW_viewport_engine_data_get("EditSurfaceMode");
vedata = DRW_viewport_engine_data_get("EditSurfaceMode");
EDIT_SURFACE_TextureList *txl = vedata->txl;
EDIT_SURFACE_FramebufferList *fbl = vedata->fbl;
EDIT_SURFACE_StorageList *stl = vedata->stl;
UNUSED_VARS(txl, fbl, stl);
/* Init Framebuffers like this: order is attachment order (for color texs) */
/*
* DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24},
@ -146,6 +148,8 @@ static void EDIT_SURFACE_cache_init(void)
EDIT_SURFACE_PassList *psl = vedata->psl;
EDIT_SURFACE_StorageList *stl = vedata->stl;
UNUSED_VARS(stl);
{
/* Create a pass */
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
@ -173,6 +177,8 @@ static void EDIT_SURFACE_cache_populate(Object *ob)
EDIT_SURFACE_PassList *psl = vedata->psl;
EDIT_SURFACE_StorageList *stl = vedata->stl;
UNUSED_VARS(psl, stl);
if (ob->type == OB_MESH) {
/* Get geometry cache */
struct Batch *geom = DRW_cache_surface_get(ob);
@ -182,13 +188,14 @@ static void EDIT_SURFACE_cache_populate(Object *ob)
}
}
/* Optionnal : Post-cache_populate callback */
/* Optional: Post-cache_populate callback */
static void EDIT_SURFACE_cache_finish(void)
{
EDIT_SURFACE_PassList *psl = vedata->psl;
EDIT_SURFACE_StorageList *stl = vedata->stl;
/* Do something here! dependant on the objects gathered */
UNUSED_VARS(psl, stl);
}
/* Draw time ! Control rendering pipeline from here */
@ -202,6 +209,8 @@ static void EDIT_SURFACE_draw_scene(void)
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
UNUSED_VARS(fbl, dfbl, dtxl);
/* Show / hide entire passes, swap framebuffers ... whatever you fancy */
/*
* DRW_framebuffer_texture_detach(dtxl->depth);
@ -238,6 +247,7 @@ static void EDIT_SURFACE_engine_free(void)
* source/blender/makesrna/intern/rna_scene.c
* source/blender/blenkernel/intern/layer.c
*/
#if 0
void EDIT_SURFACE_collection_settings_create(CollectionEngineSettings *ces)
{
BLI_assert(ces);
@ -245,6 +255,7 @@ void EDIT_SURFACE_collection_settings_create(CollectionEngineSettings *ces)
// BKE_collection_engine_property_add_int(ces, "my_int_prop", 0);
// BKE_collection_engine_property_add_float(ces, "my_float_prop", 0.0f);
}
#endif
DrawEngineType draw_engine_edit_surface_type = {
NULL, NULL,

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

@ -110,14 +110,16 @@ static EDIT_TEXT_Data *vedata;
/* Init Textures, Framebuffers, Storage and Shaders.
* It is called for every frames.
* (Optionnal) */
* (Optional) */
static void EDIT_TEXT_engine_init(void)
{
EDIT_TEXT_Data *vedata = DRW_viewport_engine_data_get("EditTextMode");
vedata = DRW_viewport_engine_data_get("EditTextMode");
EDIT_TEXT_TextureList *txl = vedata->txl;
EDIT_TEXT_FramebufferList *fbl = vedata->fbl;
EDIT_TEXT_StorageList *stl = vedata->stl;
UNUSED_VARS(txl, fbl, stl);
/* Init Framebuffers like this: order is attachment order (for color texs) */
/*
* DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24},
@ -146,6 +148,8 @@ static void EDIT_TEXT_cache_init(void)
EDIT_TEXT_PassList *psl = vedata->psl;
EDIT_TEXT_StorageList *stl = vedata->stl;
UNUSED_VARS(stl);
{
/* Create a pass */
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
@ -173,6 +177,8 @@ static void EDIT_TEXT_cache_populate(Object *ob)
EDIT_TEXT_PassList *psl = vedata->psl;
EDIT_TEXT_StorageList *stl = vedata->stl;
UNUSED_VARS(psl, stl);
if (ob->type == OB_MESH) {
/* Get geometry cache */
struct Batch *geom = DRW_cache_surface_get(ob);
@ -182,13 +188,14 @@ static void EDIT_TEXT_cache_populate(Object *ob)
}
}
/* Optionnal : Post-cache_populate callback */
/* Optional: Post-cache_populate callback */
static void EDIT_TEXT_cache_finish(void)
{
EDIT_TEXT_PassList *psl = vedata->psl;
EDIT_TEXT_StorageList *stl = vedata->stl;
/* Do something here! dependant on the objects gathered */
UNUSED_VARS(psl, stl);
}
/* Draw time ! Control rendering pipeline from here */
@ -202,6 +209,8 @@ static void EDIT_TEXT_draw_scene(void)
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
UNUSED_VARS(fbl, dfbl, dtxl);
/* Show / hide entire passes, swap framebuffers ... whatever you fancy */
/*
* DRW_framebuffer_texture_detach(dtxl->depth);
@ -238,6 +247,7 @@ static void EDIT_TEXT_engine_free(void)
* source/blender/makesrna/intern/rna_scene.c
* source/blender/blenkernel/intern/layer.c
*/
#if 0
void EDIT_TEXT_collection_settings_create(CollectionEngineSettings *ces)
{
BLI_assert(ces);
@ -245,6 +255,7 @@ void EDIT_TEXT_collection_settings_create(CollectionEngineSettings *ces)
// BKE_collection_engine_property_add_int(ces, "my_int_prop", 0);
// BKE_collection_engine_property_add_float(ces, "my_float_prop", 0.0f);
}
#endif
DrawEngineType draw_engine_edit_text_type = {
NULL, NULL,

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

@ -110,14 +110,16 @@ static PAINT_TEXTURE_Data *vedata;
/* Init Textures, Framebuffers, Storage and Shaders.
* It is called for every frames.
* (Optionnal) */
* (Optional) */
static void PAINT_TEXTURE_engine_init(void)
{
PAINT_TEXTURE_Data *vedata = DRW_viewport_engine_data_get("PaintTextureMode");
vedata = DRW_viewport_engine_data_get("PaintTextureMode");
PAINT_TEXTURE_TextureList *txl = vedata->txl;
PAINT_TEXTURE_FramebufferList *fbl = vedata->fbl;
PAINT_TEXTURE_StorageList *stl = vedata->stl;
UNUSED_VARS(txl, fbl, stl);
/* Init Framebuffers like this: order is attachment order (for color texs) */
/*
* DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24},
@ -146,6 +148,8 @@ static void PAINT_TEXTURE_cache_init(void)
PAINT_TEXTURE_PassList *psl = vedata->psl;
PAINT_TEXTURE_StorageList *stl = vedata->stl;
UNUSED_VARS(stl);
{
/* Create a pass */
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
@ -173,6 +177,8 @@ static void PAINT_TEXTURE_cache_populate(Object *ob)
PAINT_TEXTURE_PassList *psl = vedata->psl;
PAINT_TEXTURE_StorageList *stl = vedata->stl;
UNUSED_VARS(psl, stl);
if (ob->type == OB_MESH) {
/* Get geometry cache */
struct Batch *geom = DRW_cache_surface_get(ob);
@ -182,13 +188,14 @@ static void PAINT_TEXTURE_cache_populate(Object *ob)
}
}
/* Optionnal : Post-cache_populate callback */
/* Optional: Post-cache_populate callback */
static void PAINT_TEXTURE_cache_finish(void)
{
PAINT_TEXTURE_PassList *psl = vedata->psl;
PAINT_TEXTURE_StorageList *stl = vedata->stl;
/* Do something here! dependant on the objects gathered */
UNUSED_VARS(psl, stl);
}
/* Draw time ! Control rendering pipeline from here */
@ -202,6 +209,8 @@ static void PAINT_TEXTURE_draw_scene(void)
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
UNUSED_VARS(fbl, dfbl, dtxl);
/* Show / hide entire passes, swap framebuffers ... whatever you fancy */
/*
* DRW_framebuffer_texture_detach(dtxl->depth);
@ -238,6 +247,7 @@ static void PAINT_TEXTURE_engine_free(void)
* source/blender/makesrna/intern/rna_scene.c
* source/blender/blenkernel/intern/layer.c
*/
#if 0
void PAINT_TEXTURE_collection_settings_create(CollectionEngineSettings *ces)
{
BLI_assert(ces);
@ -245,6 +255,7 @@ void PAINT_TEXTURE_collection_settings_create(CollectionEngineSettings *ces)
// BKE_collection_engine_property_add_int(ces, "my_int_prop", 0);
// BKE_collection_engine_property_add_float(ces, "my_float_prop", 0.0f);
}
#endif
DrawEngineType draw_engine_paint_texture_type = {
NULL, NULL,

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

@ -110,14 +110,16 @@ static PAINT_VERTEX_Data *vedata;
/* Init Textures, Framebuffers, Storage and Shaders.
* It is called for every frames.
* (Optionnal) */
* (Optional) */
static void PAINT_VERTEX_engine_init(void)
{
PAINT_VERTEX_Data *vedata = DRW_viewport_engine_data_get("PaintVertexMode");
vedata = DRW_viewport_engine_data_get("PaintVertexMode");
PAINT_VERTEX_TextureList *txl = vedata->txl;
PAINT_VERTEX_FramebufferList *fbl = vedata->fbl;
PAINT_VERTEX_StorageList *stl = vedata->stl;
UNUSED_VARS(txl, fbl, stl);
/* Init Framebuffers like this: order is attachment order (for color texs) */
/*
* DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24},
@ -146,6 +148,8 @@ static void PAINT_VERTEX_cache_init(void)
PAINT_VERTEX_PassList *psl = vedata->psl;
PAINT_VERTEX_StorageList *stl = vedata->stl;
UNUSED_VARS(stl);
{
/* Create a pass */
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
@ -173,6 +177,8 @@ static void PAINT_VERTEX_cache_populate(Object *ob)
PAINT_VERTEX_PassList *psl = vedata->psl;
PAINT_VERTEX_StorageList *stl = vedata->stl;
UNUSED_VARS(psl, stl);
if (ob->type == OB_MESH) {
/* Get geometry cache */
struct Batch *geom = DRW_cache_surface_get(ob);
@ -182,13 +188,14 @@ static void PAINT_VERTEX_cache_populate(Object *ob)
}
}
/* Optionnal : Post-cache_populate callback */
/* Optional: Post-cache_populate callback */
static void PAINT_VERTEX_cache_finish(void)
{
PAINT_VERTEX_PassList *psl = vedata->psl;
PAINT_VERTEX_StorageList *stl = vedata->stl;
/* Do something here! dependant on the objects gathered */
UNUSED_VARS(psl, stl);
}
/* Draw time ! Control rendering pipeline from here */
@ -202,6 +209,8 @@ static void PAINT_VERTEX_draw_scene(void)
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
UNUSED_VARS(fbl, dfbl, dtxl);
/* Show / hide entire passes, swap framebuffers ... whatever you fancy */
/*
* DRW_framebuffer_texture_detach(dtxl->depth);
@ -238,6 +247,7 @@ static void PAINT_VERTEX_engine_free(void)
* source/blender/makesrna/intern/rna_scene.c
* source/blender/blenkernel/intern/layer.c
*/
#if 0
void PAINT_VERTEX_collection_settings_create(CollectionEngineSettings *ces)
{
BLI_assert(ces);
@ -245,6 +255,7 @@ void PAINT_VERTEX_collection_settings_create(CollectionEngineSettings *ces)
// BKE_collection_engine_property_add_int(ces, "my_int_prop", 0);
// BKE_collection_engine_property_add_float(ces, "my_float_prop", 0.0f);
}
#endif
DrawEngineType draw_engine_paint_vertex_type = {
NULL, NULL,

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

@ -110,14 +110,16 @@ static PAINT_WEIGHT_Data *vedata;
/* Init Textures, Framebuffers, Storage and Shaders.
* It is called for every frames.
* (Optionnal) */
* (Optional) */
static void PAINT_WEIGHT_engine_init(void)
{
PAINT_WEIGHT_Data *vedata = DRW_viewport_engine_data_get("PaintWeightMode");
vedata = DRW_viewport_engine_data_get("PaintWeightMode");
PAINT_WEIGHT_TextureList *txl = vedata->txl;
PAINT_WEIGHT_FramebufferList *fbl = vedata->fbl;
PAINT_WEIGHT_StorageList *stl = vedata->stl;
UNUSED_VARS(txl, fbl, stl);
/* Init Framebuffers like this: order is attachment order (for color texs) */
/*
* DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24},
@ -146,6 +148,8 @@ static void PAINT_WEIGHT_cache_init(void)
PAINT_WEIGHT_PassList *psl = vedata->psl;
PAINT_WEIGHT_StorageList *stl = vedata->stl;
UNUSED_VARS(stl);
{
/* Create a pass */
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
@ -173,6 +177,8 @@ static void PAINT_WEIGHT_cache_populate(Object *ob)
PAINT_WEIGHT_PassList *psl = vedata->psl;
PAINT_WEIGHT_StorageList *stl = vedata->stl;
UNUSED_VARS(psl, stl);
if (ob->type == OB_MESH) {
/* Get geometry cache */
struct Batch *geom = DRW_cache_surface_get(ob);
@ -182,13 +188,14 @@ static void PAINT_WEIGHT_cache_populate(Object *ob)
}
}
/* Optionnal : Post-cache_populate callback */
/* Optional: Post-cache_populate callback */
static void PAINT_WEIGHT_cache_finish(void)
{
PAINT_WEIGHT_PassList *psl = vedata->psl;
PAINT_WEIGHT_StorageList *stl = vedata->stl;
/* Do something here! dependant on the objects gathered */
UNUSED_VARS(psl, stl);
}
/* Draw time ! Control rendering pipeline from here */
@ -202,6 +209,8 @@ static void PAINT_WEIGHT_draw_scene(void)
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
UNUSED_VARS(fbl, dfbl, dtxl);
/* Show / hide entire passes, swap framebuffers ... whatever you fancy */
/*
* DRW_framebuffer_texture_detach(dtxl->depth);
@ -238,6 +247,7 @@ static void PAINT_WEIGHT_engine_free(void)
* source/blender/makesrna/intern/rna_scene.c
* source/blender/blenkernel/intern/layer.c
*/
#if 0
void PAINT_WEIGHT_collection_settings_create(CollectionEngineSettings *ces)
{
BLI_assert(ces);
@ -245,6 +255,7 @@ void PAINT_WEIGHT_collection_settings_create(CollectionEngineSettings *ces)
// BKE_collection_engine_property_add_int(ces, "my_int_prop", 0);
// BKE_collection_engine_property_add_float(ces, "my_float_prop", 0.0f);
}
#endif
DrawEngineType draw_engine_paint_weight_type = {
NULL, NULL,

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

@ -110,14 +110,16 @@ static PARTICLE_Data *vedata;
/* Init Textures, Framebuffers, Storage and Shaders.
* It is called for every frames.
* (Optionnal) */
* (Optional) */
static void PARTICLE_engine_init(void)
{
PARTICLE_Data *vedata = DRW_viewport_engine_data_get("ParticleMode");
vedata = DRW_viewport_engine_data_get("ParticleMode");
PARTICLE_TextureList *txl = vedata->txl;
PARTICLE_FramebufferList *fbl = vedata->fbl;
PARTICLE_StorageList *stl = vedata->stl;
UNUSED_VARS(txl, fbl, stl);
/* Init Framebuffers like this: order is attachment order (for color texs) */
/*
* DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24},
@ -146,6 +148,8 @@ static void PARTICLE_cache_init(void)
PARTICLE_PassList *psl = vedata->psl;
PARTICLE_StorageList *stl = vedata->stl;
UNUSED_VARS(stl);
{
/* Create a pass */
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
@ -173,6 +177,8 @@ static void PARTICLE_cache_populate(Object *ob)
PARTICLE_PassList *psl = vedata->psl;
PARTICLE_StorageList *stl = vedata->stl;
UNUSED_VARS(psl, stl);
if (ob->type == OB_MESH) {
/* Get geometry cache */
struct Batch *geom = DRW_cache_surface_get(ob);
@ -182,13 +188,14 @@ static void PARTICLE_cache_populate(Object *ob)
}
}
/* Optionnal : Post-cache_populate callback */
/* Optional: Post-cache_populate callback */
static void PARTICLE_cache_finish(void)
{
PARTICLE_PassList *psl = vedata->psl;
PARTICLE_StorageList *stl = vedata->stl;
/* Do something here! dependant on the objects gathered */
UNUSED_VARS(psl, stl);
}
/* Draw time ! Control rendering pipeline from here */
@ -202,6 +209,8 @@ static void PARTICLE_draw_scene(void)
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
UNUSED_VARS(fbl, dfbl, dtxl);
/* Show / hide entire passes, swap framebuffers ... whatever you fancy */
/*
* DRW_framebuffer_texture_detach(dtxl->depth);
@ -238,6 +247,7 @@ static void PARTICLE_engine_free(void)
* source/blender/makesrna/intern/rna_scene.c
* source/blender/blenkernel/intern/layer.c
*/
#if 0
void PARTICLE_collection_settings_create(CollectionEngineSettings *ces)
{
BLI_assert(ces);
@ -245,6 +255,7 @@ void PARTICLE_collection_settings_create(CollectionEngineSettings *ces)
// BKE_collection_engine_property_add_int(ces, "my_int_prop", 0);
// BKE_collection_engine_property_add_float(ces, "my_float_prop", 0.0f);
}
#endif
DrawEngineType draw_engine_particle_type = {
NULL, NULL,

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

@ -110,14 +110,16 @@ static POSE_Data *vedata;
/* Init Textures, Framebuffers, Storage and Shaders.
* It is called for every frames.
* (Optionnal) */
* (Optional) */
static void POSE_engine_init(void)
{
POSE_Data *vedata = DRW_viewport_engine_data_get("PoseMode");
vedata = DRW_viewport_engine_data_get("PoseMode");
POSE_TextureList *txl = vedata->txl;
POSE_FramebufferList *fbl = vedata->fbl;
POSE_StorageList *stl = vedata->stl;
UNUSED_VARS(txl, fbl, stl);
/* Init Framebuffers like this: order is attachment order (for color texs) */
/*
* DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24},
@ -146,6 +148,8 @@ static void POSE_cache_init(void)
POSE_PassList *psl = vedata->psl;
POSE_StorageList *stl = vedata->stl;
UNUSED_VARS(stl);
{
/* Create a pass */
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
@ -173,6 +177,8 @@ static void POSE_cache_populate(Object *ob)
POSE_PassList *psl = vedata->psl;
POSE_StorageList *stl = vedata->stl;
UNUSED_VARS(psl, stl);
if (ob->type == OB_MESH) {
/* Get geometry cache */
struct Batch *geom = DRW_cache_surface_get(ob);
@ -182,13 +188,14 @@ static void POSE_cache_populate(Object *ob)
}
}
/* Optionnal : Post-cache_populate callback */
/* Optional: Post-cache_populate callback */
static void POSE_cache_finish(void)
{
POSE_PassList *psl = vedata->psl;
POSE_StorageList *stl = vedata->stl;
/* Do something here! dependant on the objects gathered */
UNUSED_VARS(psl, stl);
}
/* Draw time ! Control rendering pipeline from here */
@ -202,6 +209,8 @@ static void POSE_draw_scene(void)
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
UNUSED_VARS(fbl, dfbl, dtxl);
/* Show / hide entire passes, swap framebuffers ... whatever you fancy */
/*
* DRW_framebuffer_texture_detach(dtxl->depth);
@ -238,6 +247,7 @@ static void POSE_engine_free(void)
* source/blender/makesrna/intern/rna_scene.c
* source/blender/blenkernel/intern/layer.c
*/
#if 0
void POSE_collection_settings_create(CollectionEngineSettings *ces)
{
BLI_assert(ces);
@ -245,6 +255,7 @@ void POSE_collection_settings_create(CollectionEngineSettings *ces)
// BKE_collection_engine_property_add_int(ces, "my_int_prop", 0);
// BKE_collection_engine_property_add_float(ces, "my_float_prop", 0.0f);
}
#endif
DrawEngineType draw_engine_pose_type = {
NULL, NULL,

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

@ -110,14 +110,16 @@ static SCULPT_Data *vedata;
/* Init Textures, Framebuffers, Storage and Shaders.
* It is called for every frames.
* (Optionnal) */
* (Optional) */
static void SCULPT_engine_init(void)
{
SCULPT_Data *vedata = DRW_viewport_engine_data_get("SculptMode");
vedata = DRW_viewport_engine_data_get("SculptMode");
SCULPT_TextureList *txl = vedata->txl;
SCULPT_FramebufferList *fbl = vedata->fbl;
SCULPT_StorageList *stl = vedata->stl;
UNUSED_VARS(txl, fbl, stl);
/* Init Framebuffers like this: order is attachment order (for color texs) */
/*
* DRWFboTexture tex[2] = {{&txl->depth, DRW_BUF_DEPTH_24},
@ -146,6 +148,8 @@ static void SCULPT_cache_init(void)
SCULPT_PassList *psl = vedata->psl;
SCULPT_StorageList *stl = vedata->stl;
UNUSED_VARS(stl);
{
/* Create a pass */
DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS | DRW_STATE_BLEND | DRW_STATE_WIRE;
@ -173,6 +177,8 @@ static void SCULPT_cache_populate(Object *ob)
SCULPT_PassList *psl = vedata->psl;
SCULPT_StorageList *stl = vedata->stl;
UNUSED_VARS(psl, stl);
if (ob->type == OB_MESH) {
/* Get geometry cache */
struct Batch *geom = DRW_cache_surface_get(ob);
@ -182,13 +188,14 @@ static void SCULPT_cache_populate(Object *ob)
}
}
/* Optionnal : Post-cache_populate callback */
/* Optional: Post-cache_populate callback */
static void SCULPT_cache_finish(void)
{
SCULPT_PassList *psl = vedata->psl;
SCULPT_StorageList *stl = vedata->stl;
/* Do something here! dependant on the objects gathered */
UNUSED_VARS(psl, stl);
}
/* Draw time ! Control rendering pipeline from here */
@ -202,6 +209,8 @@ static void SCULPT_draw_scene(void)
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
UNUSED_VARS(fbl, dfbl, dtxl);
/* Show / hide entire passes, swap framebuffers ... whatever you fancy */
/*
* DRW_framebuffer_texture_detach(dtxl->depth);
@ -238,6 +247,7 @@ static void SCULPT_engine_free(void)
* source/blender/makesrna/intern/rna_scene.c
* source/blender/blenkernel/intern/layer.c
*/
#if 0
void SCULPT_collection_settings_create(CollectionEngineSettings *ces)
{
BLI_assert(ces);
@ -245,6 +255,7 @@ void SCULPT_collection_settings_create(CollectionEngineSettings *ces)
// BKE_collection_engine_property_add_int(ces, "my_int_prop", 0);
// BKE_collection_engine_property_add_float(ces, "my_float_prop", 0.0f);
}
#endif
DrawEngineType draw_engine_sculpt_type = {
NULL, NULL,