Revision: 36563
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36563
Author: blendix
Date: 2011-05-09 08:01:48 +0000 (Mon, 09 May 2011)
Log Message:
-----------
Code cleanup: warning fixes.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
trunk/blender/source/blender/windowmanager/intern/wm_draw.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c
2011-05-09 07:54:21 UTC (rev 36562)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c
2011-05-09 08:01:48 UTC (rev 36563)
@@ -98,19 +98,6 @@
/* proto */
-static void do_image_panel_events(bContext *C, void *UNUSED(arg), int event)
-{
- SpaceImage *sima= CTX_wm_space_image(C);
-
- switch(event) {
- case B_REDR:
- break;
- }
-
- /* all events now */
- WM_event_add_notifier(C, NC_IMAGE, sima->image);
-}
-
static void image_info(Scene *scene, ImageUser *iuser, Image *ima, ImBuf
*ibuf, char *str)
{
int ofs= 0;
Modified: trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
2011-05-09 07:54:21 UTC (rev 36562)
+++ trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
2011-05-09 08:01:48 UTC (rev 36563)
@@ -980,7 +980,7 @@
{
if (header.hasDX10Header())
{
-#pragma NV_MESSAGE("TODO: Update hasAlpha to handle all DX10 formats.")
+ /* TODO: Update hasAlpha to handle all DX10 formats. */
return
header.header10.dxgiFormat == DXGI_FORMAT_BC1_UNORM ||
header.header10.dxgiFormat == DXGI_FORMAT_BC2_UNORM ||
Modified: trunk/blender/source/blender/windowmanager/intern/wm_draw.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_draw.c 2011-05-09
07:54:21 UTC (rev 36562)
+++ trunk/blender/source/blender/windowmanager/intern/wm_draw.c 2011-05-09
08:01:48 UTC (rev 36563)
@@ -816,11 +816,3 @@
win->screen->do_draw= 1;
}
-static void wm_draw_region_modified(wmWindow *win, ARegion *ar)
-{
- int drawmethod= wm_automatic_draw_method(win);
-
- if(ELEM(drawmethod, USER_DRAW_OVERLAP, USER_DRAW_OVERLAP_FLIP))
- ED_region_tag_redraw(ar);
-}
-
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2011-05-09 07:54:21 UTC (rev 36562)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2011-05-09 08:01:48 UTC (rev 36563)
@@ -2035,6 +2035,8 @@
/* *********************** */
+#if defined(WIN32)
+
static int wm_console_toggle_op(bContext *UNUSED(C), wmOperator *UNUSED(op))
{
GHOST_toggleConsole(2);
@@ -2051,6 +2053,8 @@
ot->poll= WM_operator_winactive;
}
+#endif
+
/* ************ default paint cursors, draw always around cursor *********** */
/*
- returns handler to free
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
