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

style cleanup: whitespace / commas

Browse Source
This commit is contained in:
Campbell Barton
2012-04-29 15:47:02 +00:00
parent 038c12895f
commit e701f9b670
249 changed files with 3261 additions and 3262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_cloth.h
View File

@@ -172,7 +172,7 @@ typedef enum
CLOTH_SPRING_TYPE_STRUCTURAL = (1 << 1), CLOTH_SPRING_TYPE_STRUCTURAL = (1 << 1),
CLOTH_SPRING_TYPE_SHEAR = (1 << 2), CLOTH_SPRING_TYPE_SHEAR = (1 << 2),
CLOTH_SPRING_TYPE_BENDING = (1 << 3), CLOTH_SPRING_TYPE_BENDING = (1 << 3),
CLOTH_SPRING_TYPE_GOAL = ( 1 << 4 ), CLOTH_SPRING_TYPE_GOAL = (1 << 4)
} CLOTH_SPRING_TYPES; } CLOTH_SPRING_TYPES;
/* SPRING FLAGS */ /* SPRING FLAGS */

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

@@ -746,7 +746,7 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm )
// ABS ( clmd->sim_parms->maxgoal - clmd->sim_parms->mingoal ); // ABS ( clmd->sim_parms->maxgoal - clmd->sim_parms->mingoal );
*/ */
verts->goal = ( float ) pow ( verts->goal , 4.0f ); verts->goal = powf(verts->goal, 4.0f);
if ( verts->goal >=SOFTGOALSNAP ) { if ( verts->goal >=SOFTGOALSNAP ) {
verts->flags |= CLOTH_VERT_FLAG_PINNED; verts->flags |= CLOTH_VERT_FLAG_PINNED;
} }

2
source/blender/collada/AnimationImporter.cpp
View File

@@ -725,7 +725,7 @@ void AnimationImporter::apply_matrix_curves( Object * ob, std::vector<FCurve*>&
calc_joint_parent_mat_rest(par, NULL, root, node); calc_joint_parent_mat_rest(par, NULL, root, node);
mult_m4_m4m4(temp, par, matfra); mult_m4_m4m4(temp, par, matfra);
// evaluate_joint_world_transform_at_frame(temp, NULL, , node, fra); // evaluate_joint_world_transform_at_frame(temp, NULL, node, fra);
// calc special matrix // calc special matrix
mul_serie_m4(mat, irest, temp, irest_dae, rest, NULL, NULL, NULL, NULL); mul_serie_m4(mat, irest, temp, irest_dae, rest, NULL, NULL, NULL, NULL);

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

@@ -348,7 +348,7 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
oglrender->is_sequencer = is_sequencer; oglrender->is_sequencer = is_sequencer;
if (is_sequencer) { if (is_sequencer) {
oglrender->sseq = CTX_wm_space_seq(C);; oglrender->sseq = CTX_wm_space_seq(C);
} }

7
source/blender/editors/screen/glutil.c
View File

@@ -203,8 +203,7 @@ void fdrawcheckerboard(float x1, float y1, float x2, float y2)
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,
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,
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};
};
glColor3ubv(col1); glColor3ubv(col1);
glRectf(x1, y1, x2, y2); glRectf(x1, y1, x2, y2);
@@ -370,8 +369,8 @@ void fdrawXORellipse(float xofs, float yofs, float hw, float hh)
set_inverted_drawing(1); set_inverted_drawing(1);
glPushMatrix(); glPushMatrix();
glTranslatef(xofs, yofs, 0.0); glTranslatef(xofs, yofs, 0.0f);
glScalef(1,hh/hw,1); glScalef(1.0f, hh / hw, 1.0f);
glutil_draw_lined_arc(0.0, M_PI*2.0, hw, 20); glutil_draw_lined_arc(0.0, M_PI*2.0, hw, 20);
glPopMatrix(); glPopMatrix();

2
source/blender/makesrna/intern/rna_modifier.c
View File

@@ -1444,7 +1444,7 @@ static void rna_def_modifier_array(BlenderRNA *brna)
/* Offset parameters */ /* Offset parameters */
prop = RNA_def_property(srna, "use_constant_offset", PROP_BOOLEAN, PROP_NONE); prop = RNA_def_property(srna, "use_constant_offset", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "offset_type", MOD_ARR_OFF_CONST); RNA_def_property_boolean_sdna(prop, NULL, "offset_type", MOD_ARR_OFF_CONST);
RNA_def_property_ui_text(prop, "Constant Offset", "Add a constant offset");; RNA_def_property_ui_text(prop, "Constant Offset", "Add a constant offset");
RNA_def_property_update(prop, 0, "rna_Modifier_update"); RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "constant_offset_displace", PROP_FLOAT, PROP_TRANSLATION); prop = RNA_def_property(srna, "constant_offset_displace", PROP_FLOAT, PROP_TRANSLATION);

2
source/blender/render/intern/source/zbuf.c
View File

@@ -3772,7 +3772,7 @@ static void shade_tra_samples_fill(ShadeSample *ssamp, int x, int y, int z, int
for (samp=0; samp<R.osa; samp++) { for (samp=0; samp<R.osa; samp++) {
if (curmask & (1<<samp)) { if (curmask & (1<<samp)) {
xs= (float)x + R.jit[samp][0] + 0.5f; /* zbuffer has this inverse corrected, ensures xs,ys are inside pixel */ xs= (float)x + R.jit[samp][0] + 0.5f; /* zbuffer has this inverse corrected, ensures (xs, ys) are inside pixel */
ys= (float)y + R.jit[samp][1] + 0.5f; ys= (float)y + R.jit[samp][1] + 0.5f;
if (shi_inc) { if (shi_inc) {