[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46040] trunk/blender/source/blender: style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros.
Campbell Barton
ideasman42 at gmail.com
Mon Apr 30 17:56:11 CEST 2012
Sergey & Brecht agree, will go ahead with it. added to wiki.
http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#Braces_with_Macros
On Tue, May 1, 2012 at 12:59 AM, Joshua Leung <aligorith at gmail.com> wrote:
> Yeah, that looks ok :)
>
> On Tue, May 1, 2012 at 2:17 AM, Campbell Barton <ideasman42 at gmail.com> wrote:
>> How about this...
>>
>> When a macro simply replaces a for loop, brace is on same line, eg...
>>
>> #define BM_ITER_MESH(ele, iter, bm, itype) \
>> for (ele = BM_iter_new(iter, bm, itype, NULL); ele; ele = BM_iter_step(iter))
>>
>> BM_ITER_MESH (h, &iter, bm, t) {
>> ... code ...
>> }
>>
>> But for macros that have a begin/end, do this...
>>
>> RNA_PROP_BEGIN (ptr, itemptr, prop)
>> {
>> ...... code ...
>> }
>> RNA_PROP_END;
>>
>>
>> On Sun, Apr 29, 2012 at 11:36 PM, Joshua Leung <aligorith at gmail.com> wrote:
>>> I don't really agree about this (loop macro formatting change).
>>>
>>> Whereas with for loops, you have something like:
>>> <for-statement>
>>> <block>
>>>
>>> with the macros, it's more like:
>>> <begin-loop>
>>> <block>
>>> <end-loop>
>>>
>>> On Sun, Apr 29, 2012 at 3:14 AM, Campbell Barton <ideasman42 at gmail.com> wrote:
>>>> Revision: 46040
>>>> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46040
>>>> Author: campbellbarton
>>>> Date: 2012-04-28 15:14:16 +0000 (Sat, 28 Apr 2012)
>>>> Log Message:
>>>> -----------
>>>> style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros.
>>>>
>>>> Modified Paths:
>>>> --------------
>>>> trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
>>>> trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
>>>> trunk/blender/source/blender/blenkernel/intern/ipo.c
>>>> trunk/blender/source/blender/blenkernel/intern/mesh.c
>>>> trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
>>>> trunk/blender/source/blender/blenkernel/intern/object.c
>>>> trunk/blender/source/blender/blenkernel/intern/sequencer.c
>>>> trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
>>>> trunk/blender/source/blender/blenlib/BLI_array.h
>>>> trunk/blender/source/blender/blenlib/intern/bpath.c
>>>> trunk/blender/source/blender/blenloader/intern/readfile.c
>>>> trunk/blender/source/blender/blenloader/intern/writefile.c
>>>> trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
>>>> trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
>>>> trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
>>>> trunk/blender/source/blender/bmesh/operators/bmo_bevel.c
>>>> trunk/blender/source/blender/bmesh/operators/bmo_connect.c
>>>> trunk/blender/source/blender/bmesh/operators/bmo_create.c
>>>> trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
>>>> trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
>>>> trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c
>>>> trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
>>>> trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
>>>> trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
>>>> trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
>>>> trunk/blender/source/blender/bmesh/operators/bmo_utils.c
>>>> trunk/blender/source/blender/editors/animation/keyframing.c
>>>> trunk/blender/source/blender/editors/armature/editarmature.c
>>>> trunk/blender/source/blender/editors/armature/editarmature_retarget.c
>>>> trunk/blender/source/blender/editors/armature/poseUtils.c
>>>> trunk/blender/source/blender/editors/armature/poseobject.c
>>>> trunk/blender/source/blender/editors/curve/editcurve.c
>>>> trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
>>>> trunk/blender/source/blender/editors/interface/interface_handlers.c
>>>> trunk/blender/source/blender/editors/interface/interface_layout.c
>>>> trunk/blender/source/blender/editors/interface/interface_templates.c
>>>> trunk/blender/source/blender/editors/interface/interface_utils.c
>>>> trunk/blender/source/blender/editors/mesh/editmesh_loopcut.c
>>>> trunk/blender/source/blender/editors/mesh/editmesh_rip.c
>>>> trunk/blender/source/blender/editors/mesh/editmesh_select.c
>>>> trunk/blender/source/blender/editors/mesh/editmesh_slide.c
>>>> trunk/blender/source/blender/editors/mesh/mesh_navmesh.c
>>>> trunk/blender/source/blender/editors/mesh/meshtools.c
>>>> trunk/blender/source/blender/editors/object/object_add.c
>>>> trunk/blender/source/blender/editors/object/object_bake.c
>>>> trunk/blender/source/blender/editors/object/object_constraint.c
>>>> trunk/blender/source/blender/editors/object/object_edit.c
>>>> trunk/blender/source/blender/editors/object/object_group.c
>>>> trunk/blender/source/blender/editors/object/object_hook.c
>>>> trunk/blender/source/blender/editors/object/object_modifier.c
>>>> trunk/blender/source/blender/editors/object/object_relations.c
>>>> trunk/blender/source/blender/editors/object/object_select.c
>>>> trunk/blender/source/blender/editors/object/object_transform.c
>>>> trunk/blender/source/blender/editors/object/object_vgroup.c
>>>> trunk/blender/source/blender/editors/physics/particle_edit.c
>>>> trunk/blender/source/blender/editors/render/render_shading.c
>>>> trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
>>>> trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
>>>> trunk/blender/source/blender/editors/sound/sound_ops.c
>>>> trunk/blender/source/blender/editors/space_logic/logic_buttons.c
>>>> trunk/blender/source/blender/editors/space_node/node_edit.c
>>>> trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
>>>> trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
>>>> trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
>>>> trunk/blender/source/blender/editors/space_time/space_time.c
>>>> trunk/blender/source/blender/editors/space_view3d/view3d_select.c
>>>> trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
>>>> trunk/blender/source/blender/editors/transform/transform_conversions.c
>>>> trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
>>>> trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
>>>> trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
>>>> trunk/blender/source/blender/makesrna/intern/rna_access.c
>>>> trunk/blender/source/blender/python/intern/bpy_rna.c
>>>> trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
>>>> trunk/blender/source/blender/windowmanager/intern/wm_operators.c
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-28 15:05:35 UTC (rev 46039)
>>>> +++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-28 15:14:16 UTC (rev 46040)
>>>> @@ -1223,7 +1223,7 @@
>>>> for (i=0; i<dm->numPolyData; i++, mp++) {
>>>> ml = mloop + mp->loopstart;
>>>>
>>>> - BLI_array_growitems(wtcol_l, mp->totloop);
>>>> + BLI_array_grow_items(wtcol_l, mp->totloop);
>>>> for (j = 0; j < mp->totloop; j++, ml++, totloop++) {
>>>> copy_v4_v4_char((char *)&wtcol_l[totloop],
>>>> (char *)&wtcol_v[4 * ml->v]);
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-04-28 15:05:35 UTC (rev 46039)
>>>> +++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-04-28 15:14:16 UTC (rev 46040)
>>>> @@ -162,7 +162,7 @@
>>>> /* no need to ensure the loop order, we know its ok */
>>>>
>>>> else if (f->len == 3) {
>>>> - BLI_array_growone(looptris);
>>>> + BLI_array_grow_one(looptris);
>>>> l = BM_iter_new(&liter, bm, BM_LOOPS_OF_FACE, f);
>>>> for (j=0; l; l=BM_iter_step(&liter), j++) {
>>>> looptris[i][j] = l;
>>>> @@ -171,7 +171,7 @@
>>>> }
>>>> else if (f->len == 4) {
>>>> BMLoop *ltmp[4];
>>>> - BLI_array_growitems(looptris, 2);
>>>> + BLI_array_grow_items(looptris, 2);
>>>>
>>>> l = BM_iter_new(&liter, bm, BM_LOOPS_OF_FACE, f);
>>>> for (j=0; l; l=BM_iter_step(&liter), j++) {
>>>> @@ -219,7 +219,7 @@
>>>> BLI_addfilledge(&sf_ctx, firstv, v);
>>>>
>>>> totfilltri = BLI_edgefill_ex(&sf_ctx, FALSE, f->no);
>>>> - BLI_array_growitems(looptris, totfilltri);
>>>> + BLI_array_grow_items(looptris, totfilltri);
>>>>
>>>> for (efa = sf_ctx.fillfacebase.first; efa; efa=efa->next) {
>>>> BMLoop *l1= efa->v1->tmp.p;
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/intern/ipo.c 2012-04-28 15:05:35 UTC (rev 46039)
>>>> +++ trunk/blender/source/blender/blenkernel/intern/ipo.c 2012-04-28 15:14:16 UTC (rev 46040)
>>>> @@ -1906,7 +1906,7 @@
>>>>
>>>> AnimData *adt= BKE_id_add_animdata(id);
>>>>
>>>> - SEQ_BEGIN(ed, seq) {
>>>> + SEQ_BEGIN (ed, seq) {
>>>> IpoCurve *icu = (seq->ipo) ? seq->ipo->curve.first : NULL;
>>>> short adrcode = SEQ_FAC1;
>>>>
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-04-28 15:05:35 UTC (rev 46039)
>>>> +++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-04-28 15:14:16 UTC (rev 46040)
>>>> @@ -1875,8 +1875,8 @@
>>>>
>>>> BLI_array_empty(vertcos);
>>>> BLI_array_empty(vertnos);
>>>> - BLI_array_growitems(vertcos, mp->totloop);
>>>> - BLI_array_growitems(vertnos, mp->totloop);
>>>> + BLI_array_grow_items(vertcos, mp->totloop);
>>>> + BLI_array_grow_items(vertnos, mp->totloop);
>>>>
>>>> for (j=0; j < mp->totloop; j++) {
>>>> int vindex = ml[j].v;
>>>> @@ -1885,7 +1885,7 @@
>>>> }
>>>>
>>>> BLI_array_empty(edgevecbuf);
>>>> - BLI_array_growitems(edgevecbuf, mp->totloop);
>>>> + BLI_array_grow_items(edgevecbuf, mp->totloop);
>>>>
>>>> accumulate_vertex_normals_poly(vertnos, pnors[i], vertcos, edgevecbuf, mp->totloop);
>>>> }
>>>> @@ -2422,8 +2422,8 @@
>>>> #ifdef USE_TESSFACE_SPEEDUP
>>>>
>>>> #define ML_TO_MF(i1, i2, i3) \
>>>> - BLI_array_growone(mface_to_poly_map); \
>>>> - BLI_array_growone(mface); \
>>>> + BLI_array_grow_one(mface_to_poly_map); \
>>>> + BLI_array_grow_one(mface); \
>>>> mface_to_poly_map[mface_index] = poly_index; \
>>>> mf= &mface[mface_index]; \
>>>> /* set loop indices, transformed to vert indices later */ \
>>>> @@ -2441,8 +2441,8 @@
>>>>
>>>> /* ALMOST IDENTICAL TO DEFINE ABOVE (see EXCEPTION) */
>>>> #define ML_TO_MF_QUAD() \
>>>> - BLI_array_growone(mface_to_poly_map); \
>>>> - BLI_array_growone(mface); \
>>>> + BLI_array_grow_one(mface_to_poly_map); \
>>>> + BLI_array_grow_one(mface); \
>>>> mface_to_poly_map[mface_index] = poly_index; \
>>>> mf= &mface[mface_index]; \
>>>> /* set loop indices, transformed to vert indices later */ \
>>>> @@ -2500,10 +2500,10 @@
>>>>
>>>> totfilltri = BLI_edgefill(&sf_ctx, FALSE);
>>>> if (totfilltri) {
>>>> - BLI_array_growitems(mface_to_poly_map, totfilltri);
>>>> - BLI_array_growitems(mface, totfilltri);
>>>> + BLI_array_grow_items(mface_to_poly_map, totfilltri);
>>>> + BLI_array_grow_items(mface, totfilltri);
>>>> if (poly_orig_index) {
>>>> - BLI_array_growitems(mface_orig_index, totfilltri);
>>>> + BLI_array_grow_items(mface_orig_index, totfilltri);
>>>> }
>>>>
>>>> for (f = sf_ctx.fillfacebase.first; f; f = f->next, mf++) {
>>>> @@ -2672,7 +2672,7 @@
>>>> k = 0;
>>>> for (i = 0; i<totpoly; i++, mp++) {
>>>> if (ELEM(mp->totloop, 3, 4)) {
>>>> - BLI_array_growone(mface);
>>>> + BLI_array_grow_one(mface);
>>>> mf = &mface[k];
>>>>
>>>> mf->mat_nr = mp->mat_nr;
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2012-04-28 15:05:35 UTC (rev 46039)
>>>> +++ trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2012-04-28 15:14:16 UTC (rev 46040)
>>>> @@ -117,8 +117,8 @@
>>>> BLI_array_empty(verts);
>>>> BLI_array_empty(edges);
>>>>
>>>> - BLI_array_growitems(verts, mp->totloop);
>>>> - BLI_array_growitems(edges, mp->totloop);
>>>> + BLI_array_grow_items(verts, mp->totloop);
>>>> + BLI_array_grow_items(edges, mp->totloop);
>>>>
>>>> ml = mloop + mp->loopstart;
>>>> for (j = 0; j < mp->totloop; j++, ml++) {
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/intern/object.c
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/intern/object.c 2012-04-28 15:05:35 UTC (rev 46039)
>>>> +++ trunk/blender/source/blender/blenkernel/intern/object.c 2012-04-28 15:14:16 UTC (rev 46040)
>>>> @@ -625,10 +625,11 @@
>>>> #endif
>>>> if (sce->ed) {
>>>> Sequence *seq;
>>>> - SEQ_BEGIN(sce->ed, seq)
>>>> - if (seq->scene_camera==ob) {
>>>> - seq->scene_camera= NULL;
>>>> + SEQ_BEGIN (sce->ed, seq) {
>>>> + if (seq->scene_camera == ob) {
>>>> + seq->scene_camera = NULL;
>>>> }
>>>> + }
>>>> SEQ_END
>>>> }
>>>> }
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-04-28 15:05:35 UTC (rev 46039)
>>>> +++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-04-28 15:14:16 UTC (rev 46040)
>>>> @@ -259,8 +259,7 @@
>>>> if (ed == NULL)
>>>> return;
>>>>
>>>> - SEQ_BEGIN(ed, seq)
>>>> - {
>>>> + SEQ_BEGIN (ed, seq) {
>>>> seq_free_sequence(scene, seq);
>>>> }
>>>> SEQ_END
>>>> @@ -363,7 +362,7 @@
>>>>
>>>> /* ************************* iterator ************************** */
>>>> /* *************** (replaces old WHILE_SEQ) ********************* */
>>>> -/* **************** use now SEQ_BEGIN() SEQ_END ***************** */
>>>> +/* **************** use now SEQ_BEGIN () SEQ_END ***************** */
>>>>
>>>> /* sequence strip iterator:
>>>> * - builds a full array, recursively into meta strips */
>>>>
>>>> Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-04-28 15:05:35 UTC (rev 46039)
>>>> +++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-04-28 15:14:16 UTC (rev 46040)
>>>> @@ -314,7 +314,7 @@
>>>> MLoop *ml = mloop + mp->loopstart;
>>>>
>>>> BLI_array_empty(fverts);
>>>> - BLI_array_growitems(fverts, nverts);
>>>> + BLI_array_grow_items(fverts, nverts);
>>>>
>>>> get_face_uv_map_vert(vmap, mpoly, ml, i, fverts);
>>>>
>>>> @@ -350,7 +350,7 @@
>>>> CCGFace *f;
>>>>
>>>> BLI_array_empty(fverts);
>>>> - BLI_array_growitems(fverts, nverts);
>>>> + BLI_array_grow_items(fverts, nverts);
>>>>
>>>> get_face_uv_map_vert(vmap, mpoly, ml, i, fverts);
>>>> ccgSubSurf_syncFace(ss, SET_INT_IN_POINTER(i), nverts, fverts, &f);
>>>> @@ -583,7 +583,7 @@
>>>> CCGFace *f;
>>>>
>>>> BLI_array_empty(fVerts);
>>>> - BLI_array_growitems(fVerts, mp->totloop);
>>>> + BLI_array_grow_items(fVerts, mp->totloop);
>>>>
>>>> ml = mloop + mp->loopstart;
>>>> for (j = 0; j < mp->totloop; j++, ml++) {
>>>> @@ -3150,13 +3150,13 @@
>>>> *((int *)ccgSubSurf_getFaceUserData(ss, f)) = vertNum;
>>>>
>>>> BLI_array_empty(loopidx);
>>>> - BLI_array_growitems(loopidx, numVerts);
>>>> + BLI_array_grow_items(loopidx, numVerts);
>>>> for (s = 0; s < numVerts; s++) {
>>>> loopidx[s] = loopindex++;
>>>> }
>>>>
>>>> BLI_array_empty(vertidx);
>>>> - BLI_array_growitems(vertidx, numVerts);
>>>> + BLI_array_grow_items(vertidx, numVerts);
>>>> for (s = 0; s < numVerts; s++) {
>>>> CCGVert *v = ccgSubSurf_getFaceVert(f, s);
>>>> vertidx[s] = GET_INT_FROM_POINTER(ccgSubSurf_getVertVertHandle(v));
>>>>
>>>> Modified: trunk/blender/source/blender/blenlib/BLI_array.h
>>>> ===================================================================
>>>> --- trunk/blender/source/blender/blenlib/BLI_array.h 2012-04-28 15:05:35 UTC (rev 46039)
>>>> +++ trunk/blender/source/blender/blenlib/BLI_array.h 2012-04-28 15:14:16 UTC (rev 46040)
>>>> @@ -44,7 +44,7 @@
>>>> * int i;
>>>> *
>>>> * for (i=0; i<10; i++) {
>>>> - * BLI_array_growone(arr);
>>>> + * BLI_array_grow_one(arr);
>>>> * arr[i] = something;
>>>> * }
>>>> * BLI_array_free(arr);
>>>> @@ -116,32 +116,32 @@
>>>> )
>>>>
>>>> /* grow an array by a specified number of items */
>>>> -#define BLI_array_growitems(arr, num) ( \
>>>> +#define BLI_array_grow_items(arr, num) ( \
>>>> ((void *)(arr) == NULL && (void *)(_##arr##_static) != NULL) ? \
>>>> ((arr = (void*)_##arr##_static), (_##arr##_count += num)) : \
>>>> _bli_array_grow_items(arr, num) \
>>>> )
>>>>
>>>> /* returns length of array */
>>>> -#define BLI_array_growone(arr) BLI_array_growitems(arr, 1)
>>>> +#define BLI_array_grow_one(arr) BLI_array_grow_items(arr, 1)
>>>>
>>>>
>>>> /* appends an item to the array. */
>>>>
>>>> @@ Diff output truncated at 10240 characters. @@
>>>> _______________________________________________
>>>> Bf-blender-cvs mailing list
>>>> Bf-blender-cvs at blender.org
>>>> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>>> _______________________________________________
>>> Bf-committers mailing list
>>> Bf-committers at blender.org
>>> http://lists.blender.org/mailman/listinfo/bf-committers
>>
>>
>>
>> --
>> - Campbell
>> _______________________________________________
>> Bf-committers mailing list
>> Bf-committers at blender.org
>> http://lists.blender.org/mailman/listinfo/bf-committers
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
--
- Campbell
More information about the Bf-committers
mailing list