archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton
2013-01-07 03:24:22 +00:00
parent 85b59bd89e
commit 6747dec926
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1150,7 +1150,7 @@ static void do_mul_effect_byte(float facf0, float facf1, int x, int y, unsigned
fac3 = (int)(256.0f * facf1); fac3 = (int)(256.0f * facf1);
/* formula: /* formula:
* fac * (a * b) + (1-fac)*a => fac * a * (b - 1) + axaux = c * px + py * s; //+centx * fac * (a * b) + (1 - fac) * a => fac * a * (b - 1) + axaux = c * px + py * s; //+centx
* yaux = -s * px + c * py; //+centy * yaux = -s * px + c * py; //+centy
*/ */

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

@@ -3320,7 +3320,7 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
/*I think this is for interpolating the center vert?*/ /*I think this is for interpolating the center vert?*/
w2 = w; // + numVerts*(g2_wid-1)*(g2_wid-1); //numVerts*((g2_wid-1)*g2_wid+g2_wid-1); w2 = w; // + numVerts*(g2_wid-1) * (g2_wid-1); //numVerts*((g2_wid-1) * g2_wid+g2_wid-1);
DM_interp_vert_data(dm, &ccgdm->dm, vertidx, w2, DM_interp_vert_data(dm, &ccgdm->dm, vertidx, w2,
numVerts, vertNum); numVerts, vertNum);
if (vertOrigIndex) { if (vertOrigIndex) {

2
source/blender/blenlib/BLI_scanfill.h
View File

@@ -103,7 +103,7 @@ enum {
BLI_SCANFILL_CALC_REMOVE_DOUBLES = (1 << 1), BLI_SCANFILL_CALC_REMOVE_DOUBLES = (1 << 1),
/* note: This flag removes checks for overlapping polygons. /* note: This flag removes checks for overlapping polygons.
* when this flag is set, we'll never get back more faces then (totvert - 2)*/ * when this flag is set, we'll never get back more faces then (totvert - 2) */
BLI_SCANFILL_CALC_HOLES = (1 << 2) BLI_SCANFILL_CALC_HOLES = (1 << 2)
}; };

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

@@ -1817,7 +1817,7 @@ static int point_in_slice_as(float p[3], float origin[3], float normal[3])
return 1; return 1;
} }
/*mama (knowing the squared length of the normal)*/ /*mama (knowing the squared length of the normal) */
static int point_in_slice_m(float p[3], float origin[3], float normal[3], float lns) static int point_in_slice_m(float p[3], float origin[3], float normal[3], float lns)
{ {
float h, rp[3]; float h, rp[3];

6
source/blender/bmesh/bmesh_class.h
View File

@@ -184,10 +184,10 @@ typedef struct BMesh {
* BM_LOOP isn't handled so far. */ * BM_LOOP isn't handled so far. */
char elem_index_dirty; char elem_index_dirty;
/*element pools*/ /* element pools */
struct BLI_mempool *vpool, *epool, *lpool, *fpool; struct BLI_mempool *vpool, *epool, *lpool, *fpool;
/*operator api stuff (must be all NULL or all alloc'd)*/ /* operator api stuff (must be all NULL or all alloc'd) */
struct BLI_mempool *vtoolflagpool, *etoolflagpool, *ftoolflagpool; struct BLI_mempool *vtoolflagpool, *etoolflagpool, *ftoolflagpool;
int stackdepth; int stackdepth;
@@ -205,7 +205,7 @@ typedef struct BMesh {
* Only use when the edit mesh cant be accessed - campbell */ * Only use when the edit mesh cant be accessed - campbell */
short selectmode; short selectmode;
/*ID of the shape key this bmesh came from*/ /* ID of the shape key this bmesh came from */
int shapenr; int shapenr;
int walkers, totflags; int walkers, totflags;

2
source/blender/bmesh/tools/bmesh_decimate_collapse.c
View File

@@ -172,7 +172,7 @@ static int bm_edge_collapse_is_degenerate_flip(BMEdge *e, const float optimize_c
#endif #endif
/* use a small value rather then zero so we don't flip a face in multiple steps /* use a small value rather then zero so we don't flip a face in multiple steps
* (first making it zero area, then flipping again)*/ * (first making it zero area, then flipping again) */
if (dot_v3v3(cross_exist, cross_optim) <= FLT_EPSILON) { if (dot_v3v3(cross_exist, cross_optim) <= FLT_EPSILON) {
//printf("no flip\n"); //printf("no flip\n");
return TRUE; return TRUE;

2
source/blender/editors/physics/physics_fluid.c
View File

@@ -237,7 +237,7 @@ static void init_time(FluidsimSettings *domainSettings, FluidAnimChannels *chann
{ {
int i; int i;
channels->timeAtFrame = MEM_callocN((channels->length+1)*sizeof(float), "timeAtFrame channel"); channels->timeAtFrame = MEM_callocN((channels->length + 1) * sizeof(float), "timeAtFrame channel");
channels->timeAtFrame[0] = channels->timeAtFrame[1] = domainSettings->animStart; // start at index 1 channels->timeAtFrame[0] = channels->timeAtFrame[1] = domainSettings->animStart; // start at index 1

2
source/blender/editors/render/render_preview.c
View File

@@ -712,7 +712,7 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs
else { else {
/* validate owner */ /* validate owner */
//if (ri->rect == NULL) //if (ri->rect == NULL)
// ri->rect= MEM_mallocN(sizeof(int)*ri->pr_rectx*ri->pr_recty, "BIF_previewrender"); // ri->rect= MEM_mallocN(sizeof(int) * ri->pr_rectx*ri->pr_recty, "BIF_previewrender");
//RE_ResultGet32(re, ri->rect); //RE_ResultGet32(re, ri->rect);
} }

12
source/blender/editors/space_view3d/view3d_draw.c
View File

@@ -937,7 +937,7 @@ static void draw_selected_name(Scene *scene, Object *ob, rcti *rect)
} }
/* color depends on whether there is a keyframe */ /* color depends on whether there is a keyframe */
if (id_frame_has_keyframe((ID *)ob, /*BKE_scene_frame_get(scene)*/ (float)(CFRA), ANIMFILTER_KEYS_LOCAL)) if (id_frame_has_keyframe((ID *)ob, /* BKE_scene_frame_get(scene) */ (float)(CFRA), ANIMFILTER_KEYS_LOCAL))
UI_ThemeColor(TH_VERTEX_SELECT); UI_ThemeColor(TH_VERTEX_SELECT);
else else
UI_ThemeColor(TH_TEXT_HI); UI_ThemeColor(TH_TEXT_HI);
@@ -3036,10 +3036,10 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const
for (x = 0; x < XTOT - 1; x++) { for (x = 0; x < XTOT - 1; x++) {
for (y = 0; y < YTOT - 1; y++) { for (y = 0; y < YTOT - 1; y++) {
indices[x][y][0] = x*XTOT + y; indices[x][y][0] = x * XTOT + y;
indices[x][y][1] = x*XTOT + y + 1; indices[x][y][1] = x * XTOT + y + 1;
indices[x][y][2] = (x + 1)*XTOT + y + 1; indices[x][y][2] = (x + 1) * XTOT + y + 1;
indices[x][y][3] = (x + 1)*XTOT + y; indices[x][y][3] = (x + 1) * XTOT + y;
} }
} }
@@ -3089,7 +3089,7 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const
glVertexPointer(2, GL_FLOAT, 0, grid_pos); glVertexPointer(2, GL_FLOAT, 0, grid_pos);
glColorPointer(4, GL_UNSIGNED_BYTE, 0, grid_col); glColorPointer(4, GL_UNSIGNED_BYTE, 0, grid_col);
glDrawElements(GL_QUADS, (XTOT - 1)*(YTOT - 1)*4, GL_UNSIGNED_SHORT, indices); glDrawElements(GL_QUADS, (XTOT - 1) * (YTOT - 1) * 4, GL_UNSIGNED_SHORT, indices);
glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_COLOR_ARRAY); glDisableClientState(GL_COLOR_ARRAY);

2
source/blender/render/intern/raytrace/rayobject_octree.cpp
View File

@@ -1015,7 +1015,7 @@ static int RE_rayobject_octree_intersect(RayObject *tree, Isect *is)
vec2[2] = oz1 - dda_lambda * doz; vec2[2] = oz1 - dda_lambda * doz;
calc_ocval_ray(&ocval, (float)xo, (float)yo, (float)zo, vec1, vec2); calc_ocval_ray(&ocval, (float)xo, (float)yo, (float)zo, vec1, vec2);
//is->dist = (u1+dda_lambda*(u2-u1))*o_lambda; //is->dist = (u1 + dda_lambda * (u2 - u1)) * o_lambda;
if (testnode(oc, is, no, ocval) ) if (testnode(oc, is, no, ocval) )
found = 1; found = 1;