bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

style cleanup: missed these from previous cleanup

Browse Source
This commit is contained in:
Campbell Barton 2012-04-29 17:55:54 +00:00
parent 0331c77df1
commit 1b47e2678e
18 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,7 +531,7 @@ DO_INLINE void del_bfmatrix(fmatrix3x3 *matrix)
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 */

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

@ -1016,7 +1016,7 @@ static void IDnames_to_dyn_pupstring(DynStr *pupds, ListBase *lb, ID *link, shor
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:

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

@ -263,7 +263,7 @@ int normal_projection_project_vertex(char options, const float *vert, const floa
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;

4
source/blender/blenkernel/intern/softbody.c
View File

@ -237,7 +237,7 @@ static float _final_goal(Object *ob, BodyPoint *bp)/*jow_go_for2_5 */
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 @@ static float _final_mass(Object *ob, BodyPoint *bp)
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 ------*/

4
source/blender/blenlib/intern/BLI_kdopbvh.c
View File

@ -369,9 +369,9 @@ static void build_skip_links(BVHTree *tree, BVHNode *node, BVHNode *left, BVHNod
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];
}

2
source/blender/editors/armature/poseSlide.c
View File

@ -433,7 +433,7 @@ static void pose_slide_apply_quat (tPoseSlideOp *pso, tPChanFCurveLink *pfl)
/* 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);

6
source/blender/editors/curve/editcurve.c
View File

@ -3651,7 +3651,7 @@ static void rotate_direction_nurb(Nurb *nu)
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 @@ static int delete_exec(bContext *C, wmOperator *op)
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 @@ static int delete_exec(bContext *C, wmOperator *op)
}
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;

2
source/blender/editors/interface/interface_handlers.c
View File

@ -1206,7 +1206,7 @@ static void ui_but_copy_paste(bContext *C, uiBut *but, uiHandleButtonData *data,
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);
}
}

14
source/blender/editors/interface/interface_layout.c
View File

@ -857,7 +857,7 @@ void uiItemEnumO_value(uiLayout *layout, const char *name, int icon, const char
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 @@ void uiItemEnumO_string(uiLayout *layout, const char *name, int icon, const char
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 @@ void uiItemBooleanO(uiLayout *layout, const char *name, int icon, const char *op
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 @@ void uiItemIntO(uiLayout *layout, const char *name, int icon, const char *opname
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 @@ void uiItemFloatO(uiLayout *layout, const char *name, int icon, const char *opna
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 @@ void uiItemStringO(uiLayout *layout, const char *name, int icon, const char *opn
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 @@ void uiItemMenuEnumO(uiLayout *layout, const char *opname, const char *propname,
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);

6
source/blender/editors/object/object_relations.c
View File

@ -1611,7 +1611,7 @@ static void single_tex_users_expand(Main *bmain)
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 @@ static void single_tex_users_expand(Main *bmain)
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 @@ static void single_tex_users_expand(Main *bmain)
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));
}
}
}

2
source/blender/editors/object/object_vgroup.c
View File

@ -2102,7 +2102,7 @@ static int vertex_group_poll_edit_or_wpaint_vert_select(bContext *C)
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))

4
source/blender/editors/physics/particle_edit.c
View File

@ -2471,11 +2471,11 @@ static void brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customdata)
glTranslatef((float)x, (float)y, 0.0f);
glColor4ub(255, 255, 255, 128);
glEnable(GL_LINE_SMOOTH );
glEnable(GL_LINE_SMOOTH);
glEnable(GL_BLEND);
glutil_draw_lined_arc(0.0, M_PI*2.0, brush->size, 40);
glDisable(GL_BLEND);
glDisable(GL_LINE_SMOOTH );
glDisable(GL_LINE_SMOOTH);
glPopMatrix();
}

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

@ -213,16 +213,16 @@ static void fluidsimPrintChannel(FILE *file, float *channel, int paramsize, char
}
fprintf(file, " CHANNEL %s =\n", str);
for (i=0; i<channelSize;i++) {
for (i=0; i < channelSize; i++) {
fprintf(file, " ");
for (j=0;j<=entries;j++) { // also print time value
fprintf(file, " %f ", channel[i*(entries+1)+j] );
for (j=0;j <= entries;j++) { // also print time value
fprintf(file, " %f ", channel[i*(entries + 1) + j]);
if (j==entries-1) { fprintf(file, " "); }
}
fprintf(file, "\n");
}
fprintf(file, " ;\n" );
fprintf(file, " ;\n");
}
#endif
@ -958,7 +958,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor
else {
gridlevels = domainSettings->maxRefine;
}
BLI_snprintf(debugStrBuffer, sizeof(debugStrBuffer), "fluidsimBake::msg: Baking %s, refine: %d\n", fsDomain->id.name, gridlevels );
BLI_snprintf(debugStrBuffer, sizeof(debugStrBuffer), "fluidsimBake::msg: Baking %s, refine: %d\n", fsDomain->id.name, gridlevels);
elbeemDebugOut(debugStrBuffer);

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

@ -364,7 +364,7 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
/* MUST be cleared on exit */
oglrender->scene->customdata_mask_modal = (ED_view3d_datamask(oglrender->scene, oglrender->v3d) |
ED_view3d_object_datamask(oglrender->scene) );
ED_view3d_object_datamask(oglrender->scene));
/* apply immediately in case we're rendering from a script,
* running notifiers again will overwrite */

2
source/blender/editors/screen/area.c
View File

@ -80,7 +80,7 @@ static void region_draw_emboss(ARegion *ar, rcti *scirct)
rect.ymax = scirct->ymax - ar->winrct.ymin;
/* set transp line */
glEnable(GL_BLEND );
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
/* right */

6
source/blender/editors/space_view3d/drawobject.c
View File

@ -5648,7 +5648,7 @@ static void curve_draw_speed(Scene *scene, Object *ob)
if (icu == NULL || icu->totvert < 2)
return;
glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE) );
glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
bglBegin(GL_POINTS);
for (a = 0, bezt = icu->bezt; a < icu->totvert; a++, bezt++) {
@ -7168,7 +7168,7 @@ static void bbs_obmode_mesh_verts(Object *ob, DerivedMesh *dm, int offset)
MVert *mvert = me->mvert;
data.mvert = mvert;
data.offset = (void *)(intptr_t) offset;
glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE) );
glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
bglBegin(GL_POINTS);
dm->foreachMappedVert(dm, bbs_obmode_mesh_verts__mapFunc, &data);
bglEnd();
@ -7191,7 +7191,7 @@ static void bbs_mesh_verts(BMEditMesh *em, DerivedMesh *dm, int offset)
{
void *ptrs[2] = {(void *)(intptr_t) offset, em};
glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE) );
glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
bglBegin(GL_POINTS);
dm->foreachMappedVert(dm, bbs_mesh_verts__mapFunc, ptrs);
bglEnd();

2
source/blender/gpu/intern/gpu_material.c
View File

@ -1048,7 +1048,7 @@ static void do_material_tex(GPUShadeInput *shi)
if (tex->imaflag & TEX_NORMALMAP) {
/* normalmap image */
GPU_link(mat, "mtex_normal", texco, GPU_image(tex->ima, &tex->iuser), &tnor );
GPU_link(mat, "mtex_normal", texco, GPU_image(tex->ima, &tex->iuser), &tnor);
if (mtex->norfac < 0.0f)
GPU_link(mat, "mtex_negate_texnormal", tnor, &tnor);

4
source/blender/makesrna/intern/rna_object_api.c
View File

@ -114,7 +114,7 @@ Mesh *rna_Object_to_mesh(Object *ob, ReportList *reports, Scene *sce, int apply_
/* nurbs_to_mesh changes the type to a mesh, check it worked */
if (tmpobj->type != OB_MESH) {
free_libblock_us(&(G.main->object), tmpobj );
free_libblock_us(&(G.main->object), tmpobj);
BKE_report(reports, RPT_ERROR, "cant convert curve to mesh. Does the curve have any segments?");
return NULL;
}
@ -364,7 +364,7 @@ static void rna_Mesh_assign_verts_to_group(Object *ob, bDeformGroup *group, int
}
if (assignmode != WEIGHT_REPLACE && assignmode != WEIGHT_ADD && assignmode != WEIGHT_SUBTRACT) {
BKE_report(reports, RPT_ERROR, "Bad assignment mode" );
BKE_report(reports, RPT_ERROR, "Bad assignment mode");
return;
}