[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53232] trunk/blender/source/blender: fix own error in bmesh/openmp unhiding, set BM_OMP_LIMIT to 0 so we can spot these cases more easily ( will change before release).

[Campbell Barton]

On Sat, Dec 22, 2012 at 2:37 AM, Sergey Sharybin <sergey.vfx at gmail.com> wrote:
> what about this:
> #ifdef NDEBUG
> #  define BM_OMP_LIMIT 1000
> #else
> #  define BM_OMP_LIMIT 0
> #endif
>
> No need to worry about release builds and no possible slowdown for users
> who're using trunk?
>
>
> On Fri, Dec 21, 2012 at 12:06 PM, Campbell Barton <ideasman42 at gmail.com>wrote:
>
>> Revision: 53232
>>
>> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53232
>> Author:   campbellbarton
>> Date:     2012-12-21 06:06:17 +0000 (Fri, 21 Dec 2012)
>> Log Message:
>> -----------
>> fix own error in bmesh/openmp unhiding, set BM_OMP_LIMIT to 0 so we can
>> spot these cases more easily (will change before release).
>>
>> Modified Paths:
>> --------------
>>     trunk/blender/source/blender/bmesh/bmesh_class.h
>>     trunk/blender/source/blender/editors/mesh/editmesh_utils.c
>>
>> Modified: trunk/blender/source/blender/bmesh/bmesh_class.h
>> ===================================================================
>> --- trunk/blender/source/blender/bmesh/bmesh_class.h    2012-12-21
>> 05:57:37 UTC (rev 53231)
>> +++ trunk/blender/source/blender/bmesh/bmesh_class.h    2012-12-21
>> 06:06:17 UTC (rev 53232)
>> @@ -277,6 +277,6 @@
>>   * but should not error on valid cases */
>>  #define BM_LOOP_RADIAL_MAX 10000
>>  #define BM_NGON_MAX 100000
>> -#define BM_OMP_LIMIT 10000
>> +#define BM_OMP_LIMIT 0  /* setting zero so we can catch bugs in
>> OpenMP/BMesh */
>>
>>  #endif /* __BMESH_CLASS_H__ */
>>
>> Modified: trunk/blender/source/blender/editors/mesh/editmesh_utils.c
>> ===================================================================
>> --- trunk/blender/source/blender/editors/mesh/editmesh_utils.c  2012-12-21
>> 05:57:37 UTC (rev 53231)
>> +++ trunk/blender/source/blender/editors/mesh/editmesh_utils.c  2012-12-21
>> 06:06:17 UTC (rev 53232)
>> @@ -1298,15 +1298,15 @@
>>         int sels[3] = {(em->selectmode & SCE_SELECT_VERTEX),
>>                        (em->selectmode & SCE_SELECT_EDGE),
>>                        (em->selectmode & SCE_SELECT_FACE), };
>> -
>> -       BMIter iter;
>> -       BMElem *ele;
>>         int i;
>>
>>         /* Use tag flag to remember what was hidden before all is revealed.
>>          * BM_ELEM_HIDDEN --> BM_ELEM_TAG */
>>  #pragma omp parallel for schedule(dynamic) if (em->bm->totvert +
>> em->bm->totedge + em->bm->totface >= BM_OMP_LIMIT)
>>         for (i = 0; i < 3; i++) {
>> +               BMIter iter;
>> +               BMElem *ele;
>> +
>>                 BM_ITER_MESH (ele, &iter, em->bm, iter_types[i]) {
>>                         BM_elem_flag_set(ele, BM_ELEM_TAG,
>> BM_elem_flag_test(ele, BM_ELEM_HIDDEN));
>>                 }
>> @@ -1317,6 +1317,9 @@
>>
>>         /* Select relevant just-revealed elements */
>>         for (i = 0; i < 3; i++) {
>> +               BMIter iter;
>> +               BMElem *ele;
>> +
>>                 if (!sels[i]) {
>>                         continue;
>>                 }
>>
>> _______________________________________________
>> Bf-blender-cvs mailing list
>> Bf-blender-cvs at blender.org
>> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>>
>
>
>
> --
> With best regards, Sergey Sharybin
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers

I was thinking of doing that but I'd like to have users test this too
(for a while at least).

-- 
- Campbell