Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style cleanyp

Browse Source
This commit is contained in:
Campbell Barton
2012-06-23 23:22:19 +00:00
parent 8ef4c4762b
commit 74c9c24d27
30 changed files with 331 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/container/CTR_UHeap.h
View File

@@ -164,7 +164,8 @@ public:
UpHeap(base, i);
DownHeap(base, i);
}
} else {
}
else {
m_vector.pop_back();
}
}
@@ -266,7 +267,8 @@ private:
int largest;
if (l < heap_size && HeapVal(base, l) > HeapVal(base, i)) {
largest = l;
} else {
}
else {
largest = i;
}

3
source/blender/blenkernel/intern/cloth.c
View File

@@ -821,10 +821,11 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm )
if (clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_SELF ) {
if ( dvert->dw[j].def_nr == (clmd->coll_parms->vgroup_selfcol-1)) {
if( dvert->dw [j].weight > 0.0)
if (dvert->dw [j].weight > 0.0f) {
verts->flags |= CLOTH_VERT_FLAG_NOSELFCOLL;
}
}
}
/*
// for later
if ( dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_weight-1))

2
source/blender/blenkernel/intern/collision.c
View File

@@ -843,7 +843,9 @@ int cloth_bvh_objcollision(Object *ob, ClothModifierData * clmd, float step, flo
if ((cloth->verts[i].flags & CLOTH_VERT_FLAG_NOSELFCOLL) ||
(cloth->verts[j].flags & CLOTH_VERT_FLAG_NOSELFCOLL))
{
continue;
}
sub_v3_v3v3(temp, verts[i].tx, verts[j].tx);

2
source/blender/editors/space_file/filelist.c
View File

@@ -1108,7 +1108,7 @@ void filelist_from_library(struct FileList *filelist)
filelist_sort(filelist, FILE_SORT_ALPHA);
BLI_strncpy(G.main->name, filename, sizeof(filename)); // prevent G.main->name to change
BLI_strncpy(G.main->name, filename, sizeof(filename)); /* prevent G.main->name to change */
filelist->filter = 0;
filelist_filter(filelist);

4
source/blender/imbuf/intern/anim_movie.c
View File

@@ -551,8 +551,8 @@ static int startffmpeg(struct anim *anim)
anim->pFrameDeinterlaced = avcodec_alloc_frame();
anim->pFrameRGB = avcodec_alloc_frame();
if (avpicture_get_size(PIX_FMT_RGBA, anim->x, anim->y)
!= anim->x * anim->y * 4)
if (avpicture_get_size(PIX_FMT_RGBA, anim->x, anim->y) !=
anim->x * anim->y * 4)
{
fprintf(stderr,
"ffmpeg has changed alloc scheme ... ARGHHH!\n");