[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34826] trunk/blender/source/blender: warning cleanup.
Campbell Barton
ideasman42 at gmail.com
Sun Feb 13 16:02:22 CET 2011
Revision: 34826
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34826
Author: campbellbarton
Date: 2011-02-13 15:02:21 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
warning cleanup.
- fix mistake with grease pencil UI (&& was intended but & used).
- use (void) rather then () across _all_ blenders code.
- a few minor edits, don't shadow stack variables in roll calculation & avoid running memset() for VBO vertex map.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/suggestions.c
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/screen/glutil.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_text/text_python.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/blender/imbuf/intern/allocimbuf.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/makesrna/intern/rna_render.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -2390,7 +2390,7 @@
}
}
-int BKE_ptcache_get_continue_physics()
+int BKE_ptcache_get_continue_physics(void)
{
return CONTINUE_PHYSICS;
}
Modified: trunk/blender/source/blender/blenkernel/intern/suggestions.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/suggestions.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/blenkernel/intern/suggestions.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -88,7 +88,7 @@
activeToolText = text;
}
-void texttool_text_clear() {
+void texttool_text_clear(void) {
free_texttools();
activeToolText = NULL;
}
Modified: trunk/blender/source/blender/blenlib/intern/threads.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/threads.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/blenlib/intern/threads.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -520,7 +520,7 @@
int nowait;
};
-ThreadQueue *BLI_thread_queue_init()
+ThreadQueue *BLI_thread_queue_init(void)
{
ThreadQueue *queue;
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/editors/armature/editarmature.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -2198,10 +2198,8 @@
mul_m3_v3(imat, vec);
}
else if (type==5) {
- bArmature *arm= ob->data;
- EditBone *ebone= (EditBone *)arm->act_edbone;
float mat[3][3], nor[3];
-
+ ebone= (EditBone *)arm->act_edbone;
if(ebone==NULL) {
BKE_report(op->reports, RPT_ERROR, "No active bone set");
return OPERATOR_CANCELLED;
Modified: trunk/blender/source/blender/editors/armature/reeb.c
===================================================================
--- trunk/blender/source/blender/editors/armature/reeb.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/editors/armature/reeb.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -205,7 +205,7 @@
MEM_freeN(rg);
}
-ReebGraph * newReebGraph()
+ReebGraph * newReebGraph(void)
{
ReebGraph *rg;
rg = MEM_callocN(sizeof(ReebGraph), "reeb graph");
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -141,7 +141,7 @@
uiItemL(subrow, name, ICON_NULL);
/* delete button (only if hidden but not locked!) */
- if ((gpl->flag & GP_LAYER_HIDE) & !(gpl->flag & GP_LAYER_LOCKED)) {
+ if ((gpl->flag & GP_LAYER_HIDE) && !(gpl->flag & GP_LAYER_LOCKED)) {
/* right-align ............................... */
subrow= uiLayoutRow(row, 1);
uiLayoutSetAlignment(subrow, UI_LAYOUT_ALIGN_RIGHT);
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/editors/interface/interface.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -80,17 +80,17 @@
/* ************* translation ************** */
-int ui_translate_buttons()
+int ui_translate_buttons(void)
{
return (U.transopts & USER_TR_BUTTONS);
}
-int ui_translate_menus()
+int ui_translate_menus(void)
{
return (U.transopts & USER_TR_MENUS);
}
-int ui_translate_tooltips()
+int ui_translate_tooltips(void)
{
return (U.transopts & USER_TR_TOOLTIPS);
}
Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -705,7 +705,7 @@
}
-void UI_icons_free()
+void UI_icons_free(void)
{
if(icongltex.id) {
glDeleteTextures(1, &icongltex.id);
Modified: trunk/blender/source/blender/editors/screen/glutil.c
===================================================================
--- trunk/blender/source/blender/editors/screen/glutil.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/editors/screen/glutil.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -765,7 +765,7 @@
}
}
-int bglPointHack() {
+int bglPointHack(void) {
float value[4];
int pointhack_px;
glGetFloatv(GL_POINT_SIZE_RANGE, value);
Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filelist.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/editors/space_file/filelist.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -395,7 +395,7 @@
}
//-----------------FOLDERLIST (previous/next) --------------//
-struct ListBase* folderlist_new()
+struct ListBase* folderlist_new(void)
{
ListBase* p = MEM_callocN( sizeof(ListBase), "folderlist" );
return p;
Modified: trunk/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filesel.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/editors/space_file/filesel.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -347,7 +347,7 @@
return BLF_width(style->widget.uifont_id, str);
}
-float file_font_pointsize()
+float file_font_pointsize(void)
{
#if 0
float s;
Modified: trunk/blender/source/blender/editors/space_text/text_python.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_python.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/editors/space_text/text_python.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -98,7 +98,7 @@
return 1;
}
-void text_pop_suggest_list()
+void text_pop_suggest_list(void)
{
SuggItem *item, *sel;
int *top, i;
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -4042,7 +4042,7 @@
/* Exported */
-ParamHandle *param_construct_begin()
+ParamHandle *param_construct_begin(void)
{
PHandle *handle = MEM_callocN(sizeof*handle, "PHandle");
handle->construction_chart = p_chart_new(handle);
Modified: trunk/blender/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -65,7 +65,7 @@
static int GLStates = 0;
static GPUAttrib attribData[MAX_GPU_ATTRIB_DATA] = { { -1, 0, 0 } };
-GPUBufferPool *GPU_buffer_pool_new()
+GPUBufferPool *GPU_buffer_pool_new(void)
{
GPUBufferPool *pool;
@@ -1514,7 +1514,7 @@
}
-void GPU_buffer_unbind()
+void GPU_buffer_unbind(void)
{
int i;
DEBUG_VBO("GPU_buffer_unbind\n");
Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -82,12 +82,12 @@
/* GPU Extensions */
-void GPU_extensions_disable()
+void GPU_extensions_disable(void)
{
GG.extdisabled = 1;
}
-void GPU_extensions_init()
+void GPU_extensions_init(void)
{
GLint r, g, b;
const char *vendor, *renderer;
@@ -183,12 +183,12 @@
#endif
}
-int GPU_glsl_support()
+int GPU_glsl_support(void)
{
return !GG.extdisabled && GG.glslsupport;
}
-int GPU_non_power_of_two_support()
+int GPU_non_power_of_two_support(void)
{
/* Exception for buggy ATI/Apple driver in Mac OS X 10.5/10.6,
* they claim to support this but can cause system freeze */
@@ -201,7 +201,7 @@
return GLEW_ARB_texture_non_power_of_two;
}
-int GPU_color_depth()
+int GPU_color_depth(void)
{
return GG.colordepth;
}
@@ -680,7 +680,7 @@
GPUTexture *depthtex;
};
-GPUFrameBuffer *GPU_framebuffer_create()
+GPUFrameBuffer *GPU_framebuffer_create(void)
{
GPUFrameBuffer *fb;
@@ -825,7 +825,7 @@
MEM_freeN(fb);
}
-void GPU_framebuffer_restore()
+void GPU_framebuffer_restore(void)
{
if (GG.currentfb != 0) {
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
Modified: trunk/blender/source/blender/imbuf/intern/allocimbuf.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/allocimbuf.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/imbuf/intern/allocimbuf.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -458,7 +458,7 @@
return &c;
}
-void IMB_free_cache_limiter()
+void IMB_free_cache_limiter(void)
{
delete_MEM_CacheLimiter(*get_imbuf_cache_limiter());
*get_imbuf_cache_limiter() = 0;
Modified: trunk/blender/source/blender/imbuf/intern/thumbs.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/thumbs.c 2011-02-13 14:55:39 UTC (rev 34825)
+++ trunk/blender/source/blender/imbuf/intern/thumbs.c 2011-02-13 15:02:21 UTC (rev 34826)
@@ -228,7 +228,7 @@
return rv;
}
-void IMB_thumb_makedirs()
+void IMB_thumb_makedirs(void)
{
char tpath[FILE_MAX];
if (get_thumb_dir(tpath, THB_NORMAL)) {
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list