[Bf-blender-cvs] [91837cd5b08] blender2.8: Cleanup: warnings
Campbell Barton
noreply at git.blender.org
Tue Mar 14 08:35:54 CET 2017
Commit: 91837cd5b085b24a0342fe7daccf4ec6a629dc51
Author: Campbell Barton
Date: Tue Mar 14 18:40:23 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB91837cd5b085b24a0342fe7daccf4ec6a629dc51
Cleanup: warnings
===================================================================
M source/blender/draw/modes/edit_armature_mode.c
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_armature_mode.c b/source/blender/draw/modes/edit_armature_mode.c
index f2f19eacf2d..d6193986c7f 100644
--- a/source/blender/draw/modes/edit_armature_mode.c
+++ b/source/blender/draw/modes/edit_armature_mode.c
@@ -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,
diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c
index d030a56fee2..49b48396613 100644
--- a/source/blender/draw/modes/edit_curve_mode.c
+++ b/source/blender/draw/modes/edit_curve_mode.c
@@ -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,
diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c
index 32c95db1574..e8bf1d92701 100644
--- a/source/blender/draw/modes/edit_lattice_mode.c
+++ b/source/blender/draw/modes/edit_lattice_mode.c
@@ -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,
diff --git a/source/blender/draw/modes/edit_metaball_mode.c b/source/blender/draw/modes/edit_metaball_mode.c
index e29fab4dd00..afb08abf0e8 100644
--- a/source/blender/draw/modes/edit_metaball_mode.c
+++ b/source/blender/draw/modes/edit_metaball_mode.c
@@ -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,
diff --git a/source/blender/draw/modes/edit_surface_mode.c b/source/blender/draw/modes/edit_surface_mode.c
index 9783443ead2..c3904ad3bab 100644
--- a/source/blender/draw/modes/edit_surface_mode.c
+++ b/source/blender/draw/modes/edit_surface_mode.c
@@ -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 *fb
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list