Revision: 34786
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34786
Author: campbellbarton
Date: 2011-02-12 05:12:26 +0000 (Sat, 12 Feb 2011)
Log Message:
-----------
quiet some clang warnings.
Modified Paths:
--------------
trunk/blender/intern/smoke/intern/FLUID_3D.cpp
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
Modified: trunk/blender/intern/smoke/intern/FLUID_3D.cpp
===================================================================
--- trunk/blender/intern/smoke/intern/FLUID_3D.cpp 2011-02-12 01:02:21 UTC
(rev 34785)
+++ trunk/blender/intern/smoke/intern/FLUID_3D.cpp 2011-02-12 05:12:26 UTC
(rev 34786)
@@ -605,7 +605,7 @@
int zSize = zEnd-zBegin;
int _blockTotalCells=_slabSize * zSize;
- if ((zBegin==0))
+ if (zBegin==0)
for (int y = 0; y < _yRes; y++)
for (int x = 0; x < _xRes; x++)
{
@@ -723,7 +723,7 @@
const int totalCells = _xRes * _yRes * _zRes;
index = 0;
- if ((zBegin == 0))
+ if (zBegin == 0)
for (y = 0; y < _yRes; y++)
for (x = 0; x < _xRes; x++, index++)
{
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2011-02-12
01:02:21 UTC (rev 34785)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2011-02-12
05:12:26 UTC (rev 34786)
@@ -1079,7 +1079,7 @@
minheight = pos[node->BFS_dist];
itA = node->child;
while(itA != NULL) {
- if((itA->node->color == DAG_WHITE) ) {
+ if(itA->node->color == DAG_WHITE) {
itA->node->color = DAG_GRAY;
itA->node->BFS_dist = node->BFS_dist +
1;
itA->node->k = (float) minheight;
@@ -1226,7 +1226,7 @@
itA = node->child;
while(itA != NULL) {
- if((itA->node->color == DAG_WHITE) ) {
+ if(itA->node->color == DAG_WHITE) {
itA->node->DFS_dvtm = time;
itA->node->color = DAG_GRAY;
@@ -1480,7 +1480,7 @@
itA = node->child;
while(itA != NULL) {
- if((itA->node->color == DAG_WHITE) ) {
+ if(itA->node->color == DAG_WHITE) {
itA->node->DFS_dvtm = time;
itA->node->color = DAG_GRAY;
@@ -1514,7 +1514,7 @@
itA = node->child;
while(itA != NULL) {
- if((itA->node->ob == ob2) ) {
+ if(itA->node->ob == ob2) {
return itA->node->type;
}
itA = itA->next;
@@ -1686,7 +1686,7 @@
itA = node->child;
while(itA != NULL) {
- if((itA->node->color == DAG_WHITE) ) {
+ if(itA->node->color == DAG_WHITE) {
itA->node->DFS_dvtm = time;
itA->node->color = DAG_GRAY;
@@ -2622,7 +2622,7 @@
itA = node->child;
while(itA != NULL) {
- if((itA->node->color == DAG_WHITE) ) {
+ if(itA->node->color == DAG_WHITE) {
itA->node->color = DAG_GRAY;
push_stack(nqueue,itA->node);
skip = 1;
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2011-02-12
01:02:21 UTC (rev 34785)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2011-02-12
05:12:26 UTC (rev 34786)
@@ -1262,7 +1262,7 @@
ibuf->ftype= IMAGIC;
}
#ifdef WITH_HDR
- else if ((imtype==R_RADHDR)) {
+ else if (imtype==R_RADHDR) {
ibuf->ftype= RADHDR;
}
#endif
@@ -1274,11 +1274,11 @@
}
#ifdef WITH_DDS
- else if ((imtype==R_DDS)) {
+ else if (imtype==R_DDS) {
ibuf->ftype= DDS;
}
#endif
- else if ((imtype==R_BMP)) {
+ else if (imtype==R_BMP) {
ibuf->ftype= BMP;
}
#ifdef WITH_TIFF
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2011-02-12
01:02:21 UTC (rev 34785)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2011-02-12
05:12:26 UTC (rev 34786)
@@ -698,12 +698,12 @@
bs = sb->bspring + bp->springs[b-1];
/*nasty thing here that springs have two ends
so here we have to make sure we examine the other */
- if (( v0 == bs->v1) ){
+ if (v0 == bs->v1){
bpo =sb->bpoint+bs->v2;
notthis = bs->v2;
}
else {
- if (( v0 == bs->v2) ){
+ if (v0 == bs->v2){
bpo =sb->bpoint+bs->v1;
notthis = bs->v1;
}
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2011-02-12
01:02:21 UTC (rev 34785)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2011-02-12
05:12:26 UTC (rev 34786)
@@ -459,7 +459,7 @@
char *p= temp;
char *q= file;
- while ((*p == *q)) {
+ while (*p == *q) {
++p; ++q;
/* dont search beyond the end of the string
* in the rare case they match */
Modified: trunk/blender/source/blender/makesdna/intern/makesdna.c
===================================================================
--- trunk/blender/source/blender/makesdna/intern/makesdna.c 2011-02-12
01:02:21 UTC (rev 34785)
+++ trunk/blender/source/blender/makesdna/intern/makesdna.c 2011-02-12
05:12:26 UTC (rev 34786)
@@ -269,7 +269,7 @@
additional_slen_offset = 0;
- if((str[0]==0) /* || (str[1]==0) */) return -1;
+ if(str[0]==0 /* || (str[1]==0) */) return -1;
if (str[0] == '(' && str[1] == '*') {
/* we handle function pointer and special array cases here, e.g.
@@ -281,7 +281,6 @@
if (debugSDNA > 3) printf("\t\t\t\t*** Function pointer or
multidim array pointer found\n");
/* functionpointer: transform the type (sometimes) */
i = 0;
- j = 0;
while (str[i] != ')') {
buf[i] = str[i];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
