[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54260] trunk/blender/source: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sat Feb 2 05:58:16 CET 2013
Revision: 54260
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54260
Author: campbellbarton
Date: 2013-02-02 04:58:03 +0000 (Sat, 02 Feb 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_particle.h
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
trunk/blender/source/blender/collada/SceneExporter.cpp
trunk/blender/source/blender/collada/TransformReader.cpp
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_anim.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_image/image_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
trunk/blender/source/blender/editors/transform/transform_input.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/makesdna/DNA_brush_types.h
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/nodes/shader/node_shader_util.c
trunk/blender/source/blender/render/intern/source/bake.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/creator/creator.c
trunk/blender/source/tools/CTS/FBlender.py
Modified: trunk/blender/source/blender/blenkernel/BKE_particle.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_particle.h 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/blenkernel/BKE_particle.h 2013-02-02 04:58:03 UTC (rev 54260)
@@ -96,7 +96,7 @@
float *gravity;
float hfac;
/* Average distance to neighbours (other particles in the support domain),
- for calculating the Courant number (adaptive time step). */
+ * for calculating the Courant number (adaptive time step). */
int pass;
float element_size;
float flow[3];
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2013-02-02 04:58:03 UTC (rev 54260)
@@ -507,7 +507,7 @@
dl = dl->next;
}
- /* XXX (obedit && obedit->actcol)?(obedit->actcol-1):0)) { */
+ /* XXX (obedit && obedit->actcol) ? (obedit->actcol-1) : 0)) { */
if (totvert && (tot = BLI_scanfill_calc(&sf_ctx, BLI_SCANFILL_CALC_REMOVE_DOUBLES | BLI_SCANFILL_CALC_HOLES))) {
if (tot) {
dlnew = MEM_callocN(sizeof(DispList), "filldisplist");
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-02-02 04:58:03 UTC (rev 54260)
@@ -1489,7 +1489,7 @@
if (dm == NULL) {
if (BKE_mesh_nurbs_displist_to_mdata(ob, dispbase, &allvert, &totvert,
&alledge, &totedge, &allloop,
- &allpoly, (use_orco_uv)? &alluv: NULL,
+ &allpoly, (use_orco_uv) ? &alluv : NULL,
&totloop, &totpoly) != 0)
{
/* Error initializing */
Modified: trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-02-02 04:58:03 UTC (rev 54260)
@@ -770,7 +770,7 @@
BM_edge_kill(bvh->bm, e);
/* For all remaining faces of v2, create a new face that is the
- same except it uses v1 instead of v2 */
+ * same except it uses v1 instead of v2 */
/* Note: this could be done with BM_vert_splice(), but that
* requires handling other issues like duplicate edges, so doesn't
* really buy anything. */
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2013-02-02 04:58:03 UTC (rev 54260)
@@ -1065,7 +1065,7 @@
if (ob->depsflag) {
int recalc = 0;
- // printf("depshack %s\n", ob->id.name+2);
+ // printf("depshack %s\n", ob->id.name + 2);
if (ob->depsflag & OB_DEPS_EXTRA_OB_RECALC)
recalc |= OB_RECALC_OB;
Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c 2013-02-02 04:58:03 UTC (rev 54260)
@@ -2378,7 +2378,7 @@
t2 = mean_value_half_tan_v3(co, vmid, vnext);
len = len_v3v3(co, vmid);
- w[i] = (len != 0.0f)? (t1 + t2) / len: 0.0f;
+ w[i] = (len != 0.0f) ? (t1 + t2) / len: 0.0f;
totweight += w[i];
}
@@ -2430,7 +2430,7 @@
t2 = mean_value_half_tan_v2(co, vmid, vnext);
len = len_v2v2(co, vmid);
- w[i] = (len != 0.0f)? (t1 + t2) / len: 0.0f;
+ w[i] = (len != 0.0f) ? (t1 + t2) / len: 0.0f;
totweight += w[i];
}
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2013-02-02 04:58:03 UTC (rev 54260)
@@ -518,7 +518,7 @@
* We want M to make M*A=B where A has the left side above, as columns
* and B has the right side as columns - both extended into homogeneous coords.
* So M = B*(Ainverse). Doing Ainverse by hand gives the code below.
-*/
+ */
static int make_unit_square_map(const float va[3], const float vmid[3], const float vb[3],
float r_mat[4][4])
{
@@ -1304,7 +1304,7 @@
/* Also want (i, 1, k) snapped to plane of adjacent face for
* 1 < k < ns - 1, but current initial cage and subdiv rules
- * ensure this, so nothing to do */
+ * ensure this, so nothing to do */
} while ((bndv = bndv->next) != vm->boundstart);
}
Modified: trunk/blender/source/blender/collada/SceneExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/SceneExporter.cpp 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/collada/SceneExporter.cpp 2013-02-02 04:58:03 UTC (rev 54260)
@@ -184,7 +184,7 @@
if (ob->constraints.first != NULL ){
bConstraint *con = (bConstraint*) ob->constraints.first;
- while(con){
+ while (con) {
std::string con_name(id_name(con));
std::string con_tag = con_name + "_constraint";
colladaNode.addExtraTechniqueChildParameter("blender",con_tag,"type",con->type);
Modified: trunk/blender/source/blender/collada/TransformReader.cpp
===================================================================
--- trunk/blender/source/blender/collada/TransformReader.cpp 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/collada/TransformReader.cpp 2013-02-02 04:58:03 UTC (rev 54260)
@@ -45,13 +45,13 @@
COLLADAFW::Transformation *tm = node->getTransformations()[i];
COLLADAFW::Transformation::TransformationType type = tm->getTransformationType();
-
- if(type == COLLADAFW::Transformation::MATRIX){
+
+ if (type == COLLADAFW::Transformation::MATRIX){
// XXX why does this return and discard all following transformations?
dae_matrix_to_mat4(tm, mat);
return;
}
- else{
+ else {
switch (type) {
case COLLADAFW::Transformation::TRANSLATE:
dae_translate_to_mat4(tm, cur);
Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c 2013-02-02 04:58:03 UTC (rev 54260)
@@ -146,16 +146,15 @@
marker->frame += (int)floorf(value + 0.5f);
changed++;
}
+ break;
}
- break;
-
case TFM_TIME_SCALE:
{
/* rescale the distance between the marker and the current frame */
marker->frame = cfra + (int)floorf(((float)(marker->frame - cfra) * value) + 0.5f);
changed++;
+ break;
}
- break;
}
}
}
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/editors/interface/interface.c 2013-02-02 04:58:03 UTC (rev 54260)
@@ -997,7 +997,7 @@
/* project button or block (but==NULL) to pixels in regionspace */
static void ui_but_to_pixelrect(rcti *rect, const ARegion *ar, uiBlock *block, uiBut *but)
{
- rctf rectf = (but)? but->rect: block->rect;
+ rctf rectf = (but) ? but->rect : block->rect;
ui_block_to_window_fl(ar, block, &rectf.xmin, &rectf.ymin);
ui_block_to_window_fl(ar, block, &rectf.xmax, &rectf.ymax);
Modified: trunk/blender/source/blender/editors/interface/interface_anim.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_anim.c 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/editors/interface/interface_anim.c 2013-02-02 04:58:03 UTC (rev 54260)
@@ -59,7 +59,7 @@
{
/* for entire array buttons we check the first component, it's not perfect
* but works well enough in typical cases */
- int rnaindex = (but->rnaindex == -1)? 0: but->rnaindex;
+ int rnaindex = (but->rnaindex == -1) ? 0 : but->rnaindex;
return rna_get_fcurve(&but->rnapoin, but->rnaprop, rnaindex, action, driven);
}
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2013-02-02 04:58:03 UTC (rev 54260)
@@ -3598,8 +3598,8 @@
/* ***************** region alpha blending ***************** */
/* implementation note: a disapplearing region needs at least 1 last draw with 100% backbuffer
- texture over it- then triple buffer will clear it entirely.
- This because flag RGN_HIDDEN is set in end - region doesnt draw at all then */
+ * texture over it- then triple buffer will clear it entirely.
+ * This because flag RGN_HIDDEN is set in end - region doesnt draw at all then */
typedef struct RegionAlphaInfo {
ScrArea *sa;
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2013-02-02 04:48:21 UTC (rev 54259)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2013-02-02 04:58:03 UTC (rev 54260)
@@ -4347,7 +4347,7 @@
pos[1] = (float)(mval_i[1]);
// we may want to use this later
- // BKE_brush_painter_require_imbuf(painter, ((ibuf->rect_float)? 1: 0), 0, 0);
+ // BKE_brush_painter_require_imbuf(painter, ((ibuf->rect_float) ? 1 : 0), 0, 0);
if (BKE_brush_painter_paint(painter, project_paint_op, pos, time, pressure, ps, 0)) {
return 1;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list