[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43315] trunk/blender/source/blender: remove redundant trailing slashes
Campbell Barton
ideasman42 at gmail.com
Thu Jan 12 07:11:22 CET 2012
Revision: 43315
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43315
Author: campbellbarton
Date: 2012-01-12 06:11:08 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
remove redundant trailing slashes
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenlib/intern/boxpack2d.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/space_image/image_draw.c
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
trunk/blender/source/blender/imbuf/intern/tiff.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
trunk/blender/source/blender/python/intern/bpy_props.c
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2012-01-12 05:46:45 UTC (rev 43314)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2012-01-12 06:11:08 UTC (rev 43315)
@@ -269,9 +269,9 @@
(*b)= 1;
}
- if( (dl->flag & DL_CYCL_V) && a==dl->parts-1) { \
- (*p3)-= dl->nr*dl->parts; \
- (*p4)-= dl->nr*dl->parts; \
+ if( (dl->flag & DL_CYCL_V) && a==dl->parts-1) {
+ (*p3)-= dl->nr*dl->parts;
+ (*p4)-= dl->nr*dl->parts;
}
return 1;
Modified: trunk/blender/source/blender/blenlib/intern/boxpack2d.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/boxpack2d.c 2012-01-12 05:46:45 UTC (rev 43314)
+++ trunk/blender/source/blender/blenlib/intern/boxpack2d.c 2012-01-12 06:11:08 UTC (rev 43315)
@@ -174,33 +174,33 @@
for (box=boxarray, box_index=0, i=0; box_index < len; box_index++, box++) {
- vert->blb = vert->brb = vert->tlb =\
- vert->isect_cache[0] = vert->isect_cache[1] =\
- vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+ vert->blb = vert->brb = vert->tlb =
+ vert->isect_cache[0] = vert->isect_cache[1] =
+ vert->isect_cache[2] = vert->isect_cache[3] = NULL;
vert->free = CORNERFLAGS &~ TRF;
vert->trb = box;
vert->index = i; i++;
box->v[BL] = vert; vert++;
- vert->trb= vert->brb = vert->tlb =\
- vert->isect_cache[0] = vert->isect_cache[1] =\
- vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+ vert->trb= vert->brb = vert->tlb =
+ vert->isect_cache[0] = vert->isect_cache[1] =
+ vert->isect_cache[2] = vert->isect_cache[3] = NULL;
vert->free = CORNERFLAGS &~ BLF;
vert->blb = box;
vert->index = i; i++;
box->v[TR] = vert; vert++;
- vert->trb = vert->blb = vert->tlb =\
- vert->isect_cache[0] = vert->isect_cache[1] =\
- vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+ vert->trb = vert->blb = vert->tlb =
+ vert->isect_cache[0] = vert->isect_cache[1] =
+ vert->isect_cache[2] = vert->isect_cache[3] = NULL;
vert->free = CORNERFLAGS &~ BRF;
vert->brb = box;
vert->index = i; i++;
box->v[TL] = vert; vert++;
- vert->trb = vert->blb = vert->brb =\
- vert->isect_cache[0] = vert->isect_cache[1] =\
- vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+ vert->trb = vert->blb = vert->brb =
+ vert->isect_cache[0] = vert->isect_cache[1] =
+ vert->isect_cache[2] = vert->isect_cache[3] = NULL;
vert->free = CORNERFLAGS &~ TLF;
vert->tlb = box;
vert->index = i; i++;
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c 2012-01-12 05:46:45 UTC (rev 43314)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c 2012-01-12 06:11:08 UTC (rev 43315)
@@ -165,14 +165,14 @@
GLubyte checker_stipple_sml[32*32/8] =
{
- 255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0, \
- 255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0, \
- 0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255, \
- 0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255, \
- 255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0, \
- 255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0, \
- 0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255, \
- 0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255, \
+ 255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,
+ 255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,
+ 0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,
+ 0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,
+ 255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,
+ 255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,
+ 0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,
+ 0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,
};
/* ************************************************* */
Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_draw.c 2012-01-12 05:46:45 UTC (rev 43314)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c 2012-01-12 06:11:08 UTC (rev 43315)
@@ -379,14 +379,14 @@
{
GLubyte checker_stipple[32*32/8] =
{
- 255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0, \
- 255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0, \
- 255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0, \
- 255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0, \
- 0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255, \
- 0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255, \
- 0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255, \
- 0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255, \
+ 255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0,
+ 255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0,
+ 255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0,
+ 255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0,
+ 0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255,
+ 0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255,
+ 0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255,
+ 0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255,
};
glColor3ubv(col1);
Modified: trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp 2012-01-12 05:46:45 UTC (rev 43314)
+++ trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp 2012-01-12 06:11:08 UTC (rev 43315)
@@ -703,11 +703,11 @@
void DDSHeader::setPixelFormat(uint bitcount, uint rmask, uint gmask, uint bmask, uint amask)
{
// Make sure the masks are correct.
- if ((rmask & gmask) || \
- (rmask & bmask) || \
- (rmask & amask) || \
- (gmask & bmask) || \
- (gmask & amask) || \
+ if ((rmask & gmask) ||
+ (rmask & bmask) ||
+ (rmask & amask) ||
+ (gmask & bmask) ||
+ (gmask & amask) ||
(bmask & amask)) {
printf("DDS: bad RGBA masks, pixel format not set\n");
return;
Modified: trunk/blender/source/blender/imbuf/intern/tiff.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/tiff.c 2012-01-12 05:46:45 UTC (rev 43314)
+++ trunk/blender/source/blender/imbuf/intern/tiff.c 2012-01-12 06:11:08 UTC (rev 43315)
@@ -541,7 +541,7 @@
}
else {
fprintf(stderr,
- "imb_loadtiff: could not allocate memory for TIFF " \
+ "imb_loadtiff: could not allocate memory for TIFF "
"image.\n");
TIFFClose(image);
return NULL;
Modified: trunk/blender/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm.c 2012-01-12 05:46:45 UTC (rev 43314)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm.c 2012-01-12 06:11:08 UTC (rev 43315)
@@ -371,7 +371,7 @@
{RPT_OPERATOR, "OPERATOR", 0, "Operator", ""},
{RPT_WARNING, "WARNING", 0, "Warning", ""},
{RPT_ERROR, "ERROR", 0, "Error", ""},
- {RPT_ERROR_INVALID_INPUT, "ERROR_INVALID_INPUT", 0, "Invalid Input", ""},\
+ {RPT_ERROR_INVALID_INPUT, "ERROR_INVALID_INPUT", 0, "Invalid Input", ""},
{RPT_ERROR_INVALID_CONTEXT, "ERROR_INVALID_CONTEXT", 0, "Invalid Context", ""},
{RPT_ERROR_OUT_OF_MEMORY, "ERROR_OUT_OF_MEMORY", 0, "Out of Memory", ""},
{0, NULL, 0, NULL, NULL}};
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c 2012-01-12 05:46:45 UTC (rev 43314)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c 2012-01-12 06:11:08 UTC (rev 43315)
@@ -716,10 +716,11 @@
is also empty. If both conditions are true for any one of the 4 adjacent pixels
then the current pixel is counted as being a true outer edge pixel.
*/
- if((!lomask[pix_nextCol] && !limask[pix_nextCol]) || \
- (!lomask[pix_prevCol] && !limask[pix_prevCol]) || \
- (!lomask[pix_nextRow] && !limask[pix_nextRow]) || \
- (!lomask[pix_prevRow] && !limask[pix_prevRow])) {
+ if((!lomask[pix_nextCol] && !limask[pix_nextCol]) ||
+ (!lomask[pix_prevCol] && !limask[pix_prevCol]) ||
+ (!lomask[pix_nextRow] && !limask[pix_nextRow]) ||
+ (!lomask[pix_prevRow] && !limask[pix_prevRow]))
+ {
in_osz++; // increment the outer boundary pixel count
lres[a]=3; // flag pixel as part of outer edge
} else { // it's not a boundary pixel, but it is a gradient pixel
@@ -773,10 +774,11 @@
is also empty. If both conditions are true for any one of the 4 adjacent pixels
then the current pixel is counted as being a true outer edge pixel.
*/
- if((!lomask[pix_nextCol] && !limask[pix_nextCol]) || \
- (!lomask[pix_prevCol] && !limask[pix_prevCol]) || \
- (!lomask[pix_nextRow] && !limask[pix_nextRow]) || \
- (!lomask[pix_prevRow] && !limask[pix_prevRow])) {
+ if((!lomask[pix_nextCol] && !limask[pix_nextCol]) ||
+ (!lomask[pix_prevCol] && !limask[pix_prevCol]) ||
+ (!lomask[pix_nextRow] && !limask[pix_nextRow]) ||
+ (!lomask[pix_prevRow] && !limask[pix_prevRow]))
+ {
in_osz++; // increment the outer boundary pixel count
lres[a]=3; // flag pixel as part of outer edge
} else { // it's not a boundary pixel, but it is a gradient pixel
@@ -786,10 +788,11 @@
}
} else {
- if((!limask[pix_nextCol] && lomask[pix_nextCol]) || \
- (!limask[pix_prevCol] && lomask[pix_prevCol]) || \
- (!limask[pix_nextRow] && lomask[pix_nextRow]) || \
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list