[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46086] trunk/blender/source/blender: style cleanup: missed these from previous cleanup
Campbell Barton
ideasman42 at gmail.com
Sun Apr 29 19:55:55 CEST 2012
Revision: 46086
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46086
Author: campbellbarton
Date: 2012-04-29 17:55:54 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
style cleanup: missed these from previous cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/editors/armature/poseSlide.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-04-29 17:23:19 UTC (rev 46085)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-04-29 17:55:54 UTC (rev 46086)
@@ -531,7 +531,7 @@
DO_INLINE void cp_bfmatrix(fmatrix3x3 *to, fmatrix3x3 *from)
{
// TODO bounds checking
- memcpy(to, from, sizeof(fmatrix3x3) * (from[0].vcount+from[0].scount) );
+ memcpy(to, from, sizeof(fmatrix3x3) * (from[0].vcount+from[0].scount));
}
/* init big matrix */
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2012-04-29 17:23:19 UTC (rev 46085)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2012-04-29 17:55:54 UTC (rev 46086)
@@ -1016,7 +1016,7 @@
case ID_IM: /* fall through */
case ID_WO: /* fall through */
case ID_LA: /* fall through */
- BLI_snprintf(numstr, sizeof(numstr), "%%i%d", BKE_icon_getid(id) );
+ BLI_snprintf(numstr, sizeof(numstr), "%%i%d", BKE_icon_getid(id));
BLI_dynstr_append(pupds, numstr);
break;
default:
Modified: trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2012-04-29 17:23:19 UTC (rev 46085)
+++ trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2012-04-29 17:55:54 UTC (rev 46086)
@@ -263,7 +263,7 @@
hit_tmp.dist = len_v3v3((float *)vert, hit_tmp.co);
}
- memcpy(hit, &hit_tmp, sizeof(hit_tmp) );
+ memcpy(hit, &hit_tmp, sizeof(hit_tmp));
return TRUE;
}
return FALSE;
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-04-29 17:23:19 UTC (rev 46085)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-04-29 17:55:54 UTC (rev 46086)
@@ -237,7 +237,7 @@
return (f);
}
}
- printf("_final_goal failed! sb or bp ==NULL\n" );
+ printf("_final_goal failed! sb or bp ==NULL\n");
return f; /*using crude but spot able values some times helps debuggin */
}
@@ -249,7 +249,7 @@
return(bp->mass*sb->nodemass);
}
}
- printf("_final_mass failed! sb or bp ==NULL\n" );
+ printf("_final_mass failed! sb or bp ==NULL\n");
return 1.0f;
}
/* helper functions for everything is animateble jow_go_for2_5 ------*/
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2012-04-29 17:23:19 UTC (rev 46085)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2012-04-29 17:55:54 UTC (rev 46086)
@@ -369,9 +369,9 @@
for (i = 0; i < node->totnode; i++) {
if (i+1 < node->totnode)
- build_skip_links(tree, node->children[i], left, node->children[i+1] );
+ build_skip_links(tree, node->children[i], left, node->children[i + 1]);
else
- build_skip_links(tree, node->children[i], left, right );
+ build_skip_links(tree, node->children[i], left, right);
left = node->children[i];
}
Modified: trunk/blender/source/blender/editors/armature/poseSlide.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseSlide.c 2012-04-29 17:23:19 UTC (rev 46085)
+++ trunk/blender/source/blender/editors/armature/poseSlide.c 2012-04-29 17:55:54 UTC (rev 46086)
@@ -433,7 +433,7 @@
/* perform this blending several times until a satisfactory result is reached */
while (iters-- > 0) {
/* calculate the interpolation between the endpoints */
- interp_qt_qtqt(quat_interp, quat_prev, quat_next, (cframe-pso->prevFrame) / (pso->nextFrame-pso->prevFrame) );
+ interp_qt_qtqt(quat_interp, quat_prev, quat_next, (cframe-pso->prevFrame) / (pso->nextFrame-pso->prevFrame));
/* make a copy of the original rotation */
copy_qt_qt(quat_orig, pchan->quat);
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2012-04-29 17:23:19 UTC (rev 46085)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2012-04-29 17:55:54 UTC (rev 46086)
@@ -3651,7 +3651,7 @@
SWAP(short, nu->flagu, nu->flagv);
SWAP(float *, nu->knotsu, nu->knotsv);
- switchdirection_knots(nu->knotsv, KNOTSV(nu) );
+ switchdirection_knots(nu->knotsv, KNOTSV(nu));
temp= MEM_dupallocN(nu->bp);
bp1= nu->bp;
@@ -5730,7 +5730,7 @@
if (type) {
bezt1 =
(BezTriple*)MEM_mallocN((nu->pntsu) * sizeof(BezTriple), "delNurb");
- memcpy(bezt1, nu->bezt, (nu->pntsu)*sizeof(BezTriple) );
+ memcpy(bezt1, nu->bezt, (nu->pntsu)*sizeof(BezTriple));
keyIndex_updateBezt(editnurb, nu->bezt, bezt1, nu->pntsu);
MEM_freeN(nu->bezt);
nu->bezt= bezt1;
@@ -5757,7 +5757,7 @@
}
if (type) {
bp1 = (BPoint*)MEM_mallocN(nu->pntsu * sizeof(BPoint), "delNurb2");
- memcpy(bp1, nu->bp, (nu->pntsu)*sizeof(BPoint) );
+ memcpy(bp1, nu->bp, (nu->pntsu)*sizeof(BPoint));
keyIndex_updateBP(editnurb, nu->bp, bp1, nu->pntsu);
MEM_freeN(nu->bp);
nu->bp= bp1;
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-04-29 17:23:19 UTC (rev 46085)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-04-29 17:55:54 UTC (rev 46086)
@@ -1206,7 +1206,7 @@
but->poin = MEM_callocN(sizeof(ColorBand), "colorband");
button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
- memcpy(data->coba, &but_copypaste_coba, sizeof(ColorBand) );
+ memcpy(data->coba, &but_copypaste_coba, sizeof(ColorBand));
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
}
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c 2012-04-29 17:23:19 UTC (rev 46085)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c 2012-04-29 17:55:54 UTC (rev 46086)
@@ -857,7 +857,7 @@
PointerRNA ptr;
PropertyRNA *prop;
- UI_OPERATOR_ERROR_RET(ot, opname, return );
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
WM_operator_properties_create_ptr(&ptr, ot);
@@ -888,7 +888,7 @@
EnumPropertyItem *item;
int value, free;
- UI_OPERATOR_ERROR_RET(ot, opname, return );
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
WM_operator_properties_create_ptr(&ptr, ot);
@@ -926,7 +926,7 @@
wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */
PointerRNA ptr;
- UI_OPERATOR_ERROR_RET(ot, opname, return );
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
WM_operator_properties_create_ptr(&ptr, ot);
RNA_boolean_set(&ptr, propname, value);
@@ -939,7 +939,7 @@
wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */
PointerRNA ptr;
- UI_OPERATOR_ERROR_RET(ot, opname, return );
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
WM_operator_properties_create_ptr(&ptr, ot);
RNA_int_set(&ptr, propname, value);
@@ -952,7 +952,7 @@
wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */
PointerRNA ptr;
- UI_OPERATOR_ERROR_RET(ot, opname, return );
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
WM_operator_properties_create_ptr(&ptr, ot);
RNA_float_set(&ptr, propname, value);
@@ -965,7 +965,7 @@
wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */
PointerRNA ptr;
- UI_OPERATOR_ERROR_RET(ot, opname, return );
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
WM_operator_properties_create_ptr(&ptr, ot);
RNA_string_set(&ptr, propname, value);
@@ -1609,7 +1609,7 @@
wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */
MenuItemLevel *lvl;
- UI_OPERATOR_ERROR_RET(ot, opname, return );
+ UI_OPERATOR_ERROR_RET(ot, opname, return);
if (!ot->srna) {
ui_item_disabled(layout, opname);
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c 2012-04-29 17:23:19 UTC (rev 46085)
+++ trunk/blender/source/blender/editors/object/object_relations.c 2012-04-29 17:55:54 UTC (rev 46086)
@@ -1611,7 +1611,7 @@
if (ma->id.flag & LIB_NEW) {
for (b = 0; b < MAX_MTEX; b++) {
if (ma->mtex[b] && ma->mtex[b]->tex) {
- do_single_tex_user(&(ma->mtex[b]->tex) );
+ do_single_tex_user(&(ma->mtex[b]->tex));
}
}
}
@@ -1621,7 +1621,7 @@
if (la->id.flag & LIB_NEW) {
for (b = 0; b < MAX_MTEX; b++) {
if (la->mtex[b] && la->mtex[b]->tex) {
- do_single_tex_user(&(la->mtex[b]->tex) );
+ do_single_tex_user(&(la->mtex[b]->tex));
}
}
}
@@ -1631,7 +1631,7 @@
if (wo->id.flag & LIB_NEW) {
for (b = 0; b < MAX_MTEX; b++) {
if (wo->mtex[b] && wo->mtex[b]->tex) {
- do_single_tex_user(&(wo->mtex[b]->tex) );
+ do_single_tex_user(&(wo->mtex[b]->tex));
}
}
}
Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c 2012-04-29 17:23:19 UTC (rev 46085)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c 2012-04-29 17:55:54 UTC (rev 46086)
@@ -2102,7 +2102,7 @@
return 0;
return (vgroup_object_in_edit_mode(ob) ||
- vgroup_object_in_wpaint_vert_select(ob) );
+ vgroup_object_in_wpaint_vert_select(ob));
}
static int vertex_group_add_exec(bContext *C, wmOperator *UNUSED(op))
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c 2012-04-29 17:23:19 UTC (rev 46085)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c 2012-04-29 17:55:54 UTC (rev 46086)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list