diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:36:33 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:36:33 +0300 |
commit | c1f43c9dc654f5257790654f4b77c7e55c137a19 (patch) | |
tree | 66de7276f030ab013388a43294972d4d4196b270 | |
parent | 8901263b5f04152a9c6a897c5115acd51be11bf1 (diff) |
Cleanup: warnings
-rw-r--r-- | source/blender/editors/gpencil/drawgpencil.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw_legacy.c | 4 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 3 | ||||
-rw-r--r-- | source/blender/python/generic/bgl.c | 4 |
5 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 0f0c1c9752b..69436031e11 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -94,7 +94,9 @@ typedef enum eDrawStrokeFlags { /* thickness above which we should use special drawing */ +#if 0 #define GP_DRAWTHICKNESS_SPECIAL 3 +#endif /* conversion utility (float --> normalized unsigned byte) */ #define F2UB(x) (unsigned char)(255.0f * x) diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 9bdc4d29807..ce93e5df6d2 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -200,7 +200,9 @@ static void ui_selectcontext_apply( bContext *C, uiBut *but, struct uiSelectContextStore *selctx_data, const double value, const double value_orig); +#if 0 #define IS_ALLSELECT_EVENT(event) ((event)->alt != 0) +#endif /** just show a tinted color so users know its activated */ #define UI_BUT_IS_SELECT_CONTEXT UI_BUT_NODE_ACTIVE diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index 8edd3abce0a..c5bbb621c74 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -969,11 +969,11 @@ static void draw_dupli_objects_color( apply_data = duplilist_apply(base->object, scene, lb); - DupliObject *dob_prev = NULL, *dob_next = NULL; + DupliObject *dob_next = NULL; DupliObject *dob = dupli_step(lb->first); if (dob) dob_next = dupli_step(dob->next); - for (; dob; dob_prev = dob, dob = dob_next, dob_next = dob_next ? dupli_step(dob_next->next) : NULL) { + for (; dob; dob = dob_next, dob_next = dob_next ? dupli_step(dob_next->next) : NULL) { bool testbb = false; tbase.object = dob->ob; diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 1fb1e239310..e8e3d7e11b4 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -219,11 +219,12 @@ void GPU_render_text( } /* Checking powers of two for images since OpenGL ES requires it */ - +#ifdef WITH_DDS static bool is_power_of_2_resolution(int w, int h) { return is_power_of_2_i(w) && is_power_of_2_i(h); } +#endif static bool is_over_resolution_limit(GLenum textarget, int w, int h) { diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c index 913c6649fe1..3d9c86105af 100644 --- a/source/blender/python/generic/bgl.c +++ b/source/blender/python/generic/bgl.c @@ -185,11 +185,13 @@ #define GLbitfield_ref(num) &bgl_var##num #define GLbitfield_def(num) /* unsigned */ int GLbitfield_var(num) +#if 0 /* typedef signed char GLbyte; */ #define GLbyte_str "b" #define GLbyte_var(num) bgl_var##num #define GLbyte_ref(num) &bgl_var##num #define GLbyte_def(num) signed char GLbyte_var(num) +#endif /* typedef short GLshort; */ #define GLshort_str "h" @@ -227,11 +229,13 @@ #define GLubyte_ref(num) &bgl_var##num #define GLubyte_def(num) /* unsigned */ char GLubyte_var(num) +#if 0 /* typedef unsigned short GLushort; */ #define GLushort_str "H" #define GLushort_var(num) bgl_var##num #define GLushort_ref(num) &bgl_var##num #define GLushort_def(num) /* unsigned */ short GLushort_var(num) +#endif /* typedef unsigned int GLuint; */ #define GLuint_str "I" |