Revision: 40801
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40801
Author: campbellbarton
Date: 2011-10-05 12:20:38 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
minor edits
- use TRUE/FALSE rather than 1/0
- WM_operator_properties_create_ptr rather than WM_operator_properties_create
since the pointers available.
- remove redundant strlen()
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_file/space_file.c
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2011-10-05
08:58:32 UTC (rev 40800)
+++ trunk/blender/source/blender/editors/interface/interface.c 2011-10-05
12:20:38 UTC (rev 40801)
@@ -2519,7 +2519,7 @@
but->pos= -1; /* cursor invisible */
if(ELEM4(but->type, NUM, NUMABS, NUMSLI, HSVSLI)) { /* add a space
to name */
- slen= strlen(but->str);
+ /* slen remains unchanged from previous assignment, ensure this
stays true */
if(slen>0 && slen<UI_MAX_NAME_STR-2) {
if(but->str[slen-1]!=' ') {
but->str[slen]= ' ';
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c
2011-10-05 08:58:32 UTC (rev 40800)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c
2011-10-05 12:20:38 UTC (rev 40801)
@@ -768,7 +768,7 @@
if(properties) {
PointerRNA tptr;
- WM_operator_properties_create(&tptr,
opname);
+
WM_operator_properties_create_ptr(&tptr, ot);
if(tptr.data) {
IDP_FreeProperty(tptr.data);
MEM_freeN(tptr.data);
Modified: trunk/blender/source/blender/editors/space_file/filesel.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filesel.c 2011-10-05
08:58:32 UTC (rev 40800)
+++ trunk/blender/source/blender/editors/space_file/filesel.c 2011-10-05
12:20:38 UTC (rev 40801)
@@ -248,7 +248,7 @@
/* switching thumbnails needs to recalc layout [#28809] */
if (sfile->layout) {
- sfile->layout->dirty= 1;
+ sfile->layout->dirty= TRUE;
}
return 1;
@@ -471,13 +471,14 @@
int maxlen = 0;
int numfiles;
int textheight;
+
if (sfile->layout == NULL) {
sfile->layout = MEM_callocN(sizeof(struct FileLayout),
"file_layout");
- sfile->layout->dirty = 1;
- }
+ sfile->layout->dirty = TRUE;
+ } else if (sfile->layout->dirty == FALSE) {
+ return;
+ }
- if (!sfile->layout->dirty) return;
-
numfiles = filelist_numfiles(sfile->files);
textheight = (int)file_font_pointsize();
layout = sfile->layout;
@@ -543,7 +544,7 @@
layout->width = sfile->layout->columns * (layout->tile_w +
2*layout->tile_border_x) + layout->tile_border_x*2;
layout->flag = FILE_LAYOUT_HOR;
}
- layout->dirty= 0;
+ layout->dirty= FALSE;
}
FileLayout* ED_fileselect_get_layout(struct SpaceFile *sfile, struct ARegion
*ar)
Modified: trunk/blender/source/blender/editors/space_file/space_file.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/space_file.c
2011-10-05 08:58:32 UTC (rev 40800)
+++ trunk/blender/source/blender/editors/space_file/space_file.c
2011-10-05 12:20:38 UTC (rev 40801)
@@ -154,7 +154,7 @@
SpaceFile *sfile= (SpaceFile*)sa->spacedata.first;
//printf("file_init\n");
- if(sfile->layout) sfile->layout->dirty= 1;
+ if(sfile->layout) sfile->layout->dirty= TRUE;
}
@@ -242,7 +242,7 @@
BLI_strncpy(sfile->params->renameedit,
sfile->params->renamefile, sizeof(sfile->params->renameedit));
params->renamefile[0] = '\0';
}
- if (sfile->layout) sfile->layout->dirty= 1;
+ if (sfile->layout) sfile->layout->dirty= TRUE;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
