Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-03-14 10:40:23 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-03-14 10:40:23 +0300
commit91837cd5b085b24a0342fe7daccf4ec6a629dc51 (patch)
tree82a343c149f3ac819e6e3b0187f96dc878eef7de /source/blender/draw/modes/sculpt_mode.c
parent3ee0723b7db79f782c5a6efad13d7eb43c2b017c (diff)
Cleanup: warnings
Diffstat (limited to 'source/blender/draw/modes/sculpt_mode.c')
-rw-r--r--source/blender/draw/modes/sculpt_mode.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/source/blender/draw/modes/sculpt_mode.c b/source/blender/draw/modes/sculpt_mode.c
index af7b0f42a7c..d67ff581f39 100644
--- a/source/blender/draw/modes/sculpt_mode.c
+++ b/source/blender/draw/modes/sculpt_mode.c
@@ -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,