tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

quiet some clang warnings.

This commit is contained in:
Campbell Barton 2011-02-12 05:12:26 +00:00
parent 5470a7af5d
commit 92672d0c1c
6 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/smoke/intern/FLUID_3D.cpp
View File

@ -605,7 +605,7 @@ void FLUID_3D::copyBorderAll(float* field, int zBegin, int zEnd)
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 @@ void FLUID_3D::wipeBoundariesSL(int zBegin, int zEnd)
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++)
{

12
source/blender/blenkernel/intern/depsgraph.c
View File

@ -1079,7 +1079,7 @@ void graph_bfs(void)
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 @@ DagNodeQueue * graph_dfs(void)
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 @@ struct DagNodeQueue *get_all_childs(struct DagForest *dag, void *ob)
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 @@ short are_obs_related(struct DagForest *dag, void *ob1, void *ob2) {
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 @@ void DAG_scene_sort(Main *bmain, Scene *sce)
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 @@ void DAG_pose_sort(Object *ob)
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;

6
source/blender/blenkernel/intern/image.c
View File

@ -1262,7 +1262,7 @@ int BKE_write_ibuf(Scene *scene, ImBuf *ibuf, const char *name, int imtype, int
ibuf->ftype= IMAGIC;
}
#ifdef WITH_HDR
else if ((imtype==R_RADHDR)) {
else if (imtype==R_RADHDR) {
ibuf->ftype= RADHDR;
}
#endif
@ -1274,11 +1274,11 @@ int BKE_write_ibuf(Scene *scene, ImBuf *ibuf, const char *name, int imtype, int
}
#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

4
source/blender/blenkernel/intern/softbody.c
View File

@ -698,12 +698,12 @@ static void add_2nd_order_roller(Object *ob,float UNUSED(stiffness), int *counte
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;
}

2
source/blender/blenlib/intern/path_util.c
View File

@ -459,7 +459,7 @@ void BLI_path_rel(char *file, const char *relfile)
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 */

3
source/blender/makesdna/intern/makesdna.c
View File

@ -269,7 +269,7 @@ int add_name(char *str)
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 @@ int add_name(char *str)
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];