[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58380] trunk/blender: code cleanup: use bool for widget struct, also edit odd strncpy use.
Campbell Barton
ideasman42 at gmail.com
Fri Jul 19 12:39:44 CEST 2013
Revision: 58380
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58380
Author: campbellbarton
Date: 2013-07-19 10:39:44 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
code cleanup: use bool for widget struct, also edit odd strncpy use.
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp
trunk/blender/source/blender/editors/interface/interface_widgets.c
Modified: trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp 2013-07-19 10:39:37 UTC (rev 58379)
+++ trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp 2013-07-19 10:39:44 UTC (rev 58380)
@@ -191,7 +191,7 @@
char *GHOST_DropTargetX11::FileUrlDecode(char *fileUrl)
{
- if (!strncpy(fileUrl, "file://", 7) == 0) {
+ if (strncpy(fileUrl, "file://", 7) != 0) {
/* assume one character of encoded URL can be expanded to 4 chars max */
int decodedSize = 4 * strlen(fileUrl) + 1;
char *decodedPath = (char *)malloc(decodedSize);
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c 2013-07-19 10:39:37 UTC (rev 58379)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c 2013-07-19 10:39:44 UTC (rev 58380)
@@ -96,8 +96,7 @@
float inner_v[WIDGET_SIZE_MAX][2];
float inner_uv[WIDGET_SIZE_MAX][2];
- short inner, outline, emboss; /* set on/off */
- short shadedir;
+ bool inner, outline, emboss, shadedir;
uiWidgetTrias tria1;
uiWidgetTrias tria2;
@@ -2365,7 +2364,7 @@
uiWidgetBase wtb;
int horizontal;
float rad;
- short outline = 0;
+ bool outline = false;
widget_init(&wtb);
@@ -2409,8 +2408,9 @@
wtb.emboss = 0; /* only emboss once */
/* exception for progress bar */
- if (state & UI_SCROLL_NO_OUTLINE)
- SWAP(short, outline, wtb.outline);
+ if (state & UI_SCROLL_NO_OUTLINE) {
+ SWAP(bool, outline, wtb.outline);
+ }
round_box_edges(&wtb, UI_CNR_ALL, slider, rad);
@@ -2431,8 +2431,9 @@
}
widgetbase_draw(&wtb, wcol);
- if (state & UI_SCROLL_NO_OUTLINE)
- SWAP(short, outline, wtb.outline);
+ if (state & UI_SCROLL_NO_OUTLINE) {
+ SWAP(bool, outline, wtb.outline);
+ }
}
}
More information about the Bf-blender-cvs
mailing list