[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52950] trunk/blender/source/blender: code cleanup: quiet warnings
Campbell Barton
ideasman42 at gmail.com
Thu Dec 13 01:47:50 CET 2012
Revision: 52950
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52950
Author: campbellbarton
Date: 2012-12-13 00:47:47 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
code cleanup: quiet warnings
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_nla/nla_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2012-12-13 00:41:23 UTC (rev 52949)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2012-12-13 00:47:47 UTC (rev 52950)
@@ -99,7 +99,7 @@
extern char *BKE_undo_menu_string(void);
extern void BKE_undo_number(struct bContext *C, int nr);
extern const char *BKE_undo_get_name(int nr, int *active);
-extern int BKE_undo_save_file(const struct bContext *C, char *filename);
+extern int BKE_undo_save_file(const char *filename);
extern struct Main *BKE_undo_get_main(struct Scene **scene);
/* copybuffer */
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2012-12-13 00:41:23 UTC (rev 52949)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2012-12-13 00:47:47 UTC (rev 52950)
@@ -788,7 +788,7 @@
}
/* saves .blend using undo buffer, returns 1 == success */
-int BKE_undo_save_file(const bContext *C, char *filename)
+int BKE_undo_save_file(const char *filename)
{
UndoElem *uel;
MemFileChunk *chunk;
Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c 2012-12-13 00:41:23 UTC (rev 52949)
+++ trunk/blender/source/blender/editors/screen/area.c 2012-12-13 00:47:47 UTC (rev 52950)
@@ -699,28 +699,28 @@
switch (az->edge) {
case AE_TOP_TO_BOTTOMRIGHT:
if (ar->winrct.ymax == sa->totrct.ymin) add = 1; else add = 0;
- az->x1 = ar->winrct.xmax - 2.5 * AZONEPAD_TAB_PLUSW;
+ az->x1 = ar->winrct.xmax - 2.5f * AZONEPAD_TAB_PLUSW;
az->y1 = ar->winrct.ymax - add;
- az->x2 = ar->winrct.xmax - 1.5 * AZONEPAD_TAB_PLUSW;
+ az->x2 = ar->winrct.xmax - 1.5f * AZONEPAD_TAB_PLUSW;
az->y2 = ar->winrct.ymax - add + AZONEPAD_TAB_PLUSH;
break;
case AE_BOTTOM_TO_TOPLEFT:
- az->x1 = ar->winrct.xmax - 2.5 * AZONEPAD_TAB_PLUSW;
+ az->x1 = ar->winrct.xmax - 2.5f * AZONEPAD_TAB_PLUSW;
az->y1 = ar->winrct.ymin - AZONEPAD_TAB_PLUSH;
- az->x2 = ar->winrct.xmax - 1.5 * AZONEPAD_TAB_PLUSW;
+ az->x2 = ar->winrct.xmax - 1.5f * AZONEPAD_TAB_PLUSW;
az->y2 = ar->winrct.ymin;
break;
case AE_LEFT_TO_TOPRIGHT:
az->x1 = ar->winrct.xmin - AZONEPAD_TAB_PLUSH;
- az->y1 = ar->winrct.ymax - 2.5 * AZONEPAD_TAB_PLUSW;
+ az->y1 = ar->winrct.ymax - 2.5f * AZONEPAD_TAB_PLUSW;
az->x2 = ar->winrct.xmin;
- az->y2 = ar->winrct.ymax - 1.5 * AZONEPAD_TAB_PLUSW;
+ az->y2 = ar->winrct.ymax - 1.5f * AZONEPAD_TAB_PLUSW;
break;
case AE_RIGHT_TO_TOPLEFT:
az->x1 = ar->winrct.xmax - 1;
- az->y1 = ar->winrct.ymax - 2.5 * AZONEPAD_TAB_PLUSW;
+ az->y1 = ar->winrct.ymax - 2.5f * AZONEPAD_TAB_PLUSW;
az->x2 = ar->winrct.xmax - 1 + AZONEPAD_TAB_PLUSH;
- az->y2 = ar->winrct.ymax - 1.5 * AZONEPAD_TAB_PLUSW;
+ az->y2 = ar->winrct.ymax - 1.5f * AZONEPAD_TAB_PLUSW;
break;
}
/* rect needed for mouse pointer test */
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2012-12-13 00:41:23 UTC (rev 52949)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2012-12-13 00:47:47 UTC (rev 52950)
@@ -3595,7 +3595,7 @@
} RegionAlphaInfo;
#define TIMEOUT 0.3f
-#define TIMESTEP 0.04
+#define TIMESTEP 0.04f
float ED_region_blend_factor(ARegion *ar)
{
@@ -3609,7 +3609,7 @@
alpha = (float)ar->regiontimer->duration / TIMEOUT;
/* makes sure the blend out works 100% - without area redraws */
- if (rgi->hidden) alpha = 0.9 - TIMESTEP - alpha;
+ if (rgi->hidden) alpha = 0.9f - TIMESTEP - alpha;
CLAMP(alpha, 0.0f, 1.0f);
return alpha;
@@ -3697,7 +3697,7 @@
ED_region_tag_redraw(rgi->child_ar);
/* end timer? */
- if (rgi->ar->regiontimer->duration > TIMEOUT) {
+ if (rgi->ar->regiontimer->duration > (double)TIMEOUT) {
region_blend_end(C, rgi->ar, 0);
return (OPERATOR_FINISHED | OPERATOR_PASS_THROUGH);
}
Modified: trunk/blender/source/blender/editors/space_nla/nla_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_draw.c 2012-12-13 00:41:23 UTC (rev 52949)
+++ trunk/blender/source/blender/editors/space_nla/nla_draw.c 2012-12-13 00:47:47 UTC (rev 52950)
@@ -871,8 +871,8 @@
/* XXX firstly draw a little rect to help identify that it's different from the toggles */
glBegin(GL_LINE_LOOP);
glVertex2f((float)v2d->cur.xmax - offset - 1, y - 0.35f * U.widget_unit);
- glVertex2f((float)v2d->cur.xmax - offset - 1, y + 0.45 * U.widget_unit);
- glVertex2f((float)v2d->cur.xmax - 1, y + 0.45f * U.widget_unit);
+ glVertex2f((float)v2d->cur.xmax - offset - 1, y + 0.45f * U.widget_unit);
+ glVertex2f((float)v2d->cur.xmax - 1, y + 0.45f * U.widget_unit);
glVertex2f((float)v2d->cur.xmax - 1, y - 0.35f * U.widget_unit);
glEnd(); // GL_LINES
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2012-12-13 00:41:23 UTC (rev 52949)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2012-12-13 00:47:47 UTC (rev 52950)
@@ -1432,7 +1432,10 @@
/* divider */
UI_ThemeColorShade(TH_BACK, -40);
- glRecti(tempx - 10.0 * ufac, *starty + 4.0f * ufac, tempx - 8.0f * ufac, *starty + UI_UNIT_Y - 4.0f * ufac);
+ glRecti(tempx - 10.0f * ufac,
+ *starty + 4.0f * ufac,
+ tempx - 8.0f * ufac,
+ *starty + UI_UNIT_Y - 4.0f * ufac);
glEnable(GL_BLEND);
glPixelTransferf(GL_ALPHA_SCALE, 0.5);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c 2012-12-13 00:41:23 UTC (rev 52949)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c 2012-12-13 00:47:47 UTC (rev 52950)
@@ -1006,7 +1006,7 @@
if (U.uiflag & USER_GLOBALUNDO) {
/* fast save of last undobuffer, now with UI */
- BKE_undo_save_file(C, filepath);
+ BKE_undo_save_file(filepath);
}
else {
/* save as regular blend file */
Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c 2012-12-13 00:41:23 UTC (rev 52949)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c 2012-12-13 00:47:47 UTC (rev 52950)
@@ -385,7 +385,7 @@
BLI_make_file_string("/", filename, BLI_temporary_dir(), "quit.blend");
- if (BKE_undo_save_file(C, filename))
+ if (BKE_undo_save_file(filename))
printf("Saved session recovery to '%s'\n", filename);
}
}
More information about the Bf-blender-cvs
mailing list