blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cleanup: warnings

This commit is contained in:
Campbell Barton 2017-03-02 00:36:33 +11:00
parent 8901263b5f
commit c1f43c9dc6
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/gpencil/drawgpencil.c
View File

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

2
source/blender/editors/interface/interface_handlers.c
View File

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

4
source/blender/editors/space_view3d/view3d_draw_legacy.c
View File

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

3
source/blender/gpu/intern/gpu_draw.c
View File

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

4
source/blender/python/generic/bgl.c
View File

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