[Bf-committers] [Bf-blender-cvs] [9643b2e] master: Preserve non-flat faces in boolean modifier

[Tamito KAJIYAMA]

Committed the fixes in revision 036d35d.
Boolean ops with non-flat faces seem working nicely.

Thanks,

-- 
KAJIYAMA, Tamito <rd6t-kjym at asahi-net.or.jp>


On 25/02/2014 00:33, Sergey Sharybin wrote:
> If you checked it compiles and bools works then please commit. I'll update
> patches later then when back to normal internet.
> On Feb 24, 2014 9:28 PM, "Tamito KAJIYAMA" <rd6t-kjym at asahi-net.or.jp>
> wrote:
>
>> Hi Sergey,
>>
>> After this revision MSVC 2008 gives a couple of compiler errors.
>> Could you please quickly review the following fixes and commit them
>> if you find them okay?
>>
>> Thanks,
>>
>> --
>> KAJIYAMA, Tamito <rd6t-kjym at asahi-net.or.jp>
>>
>>
>> diff --git a/extern/carve/include/carve/mesh_simplify.hpp
>> b/extern/carve/include/carve/mesh_simplify.hpp
>> index 2126c57..f0a0a96 100644
>> --- a/extern/carve/include/carve/mesh_simplify.hpp
>> +++ b/extern/carve/include/carve/mesh_simplify.hpp
>> @@ -1470,7 +1470,7 @@ namespace carve {
>>            heapval_t last;
>>            std::vector<heapval_t> heap;
>>
>> -        point_enumerator_t(vector_t _origin, int _base, int _n_dp) :
>> origin(_origin), rounding_fac(pow(_base, _n_dp)), last(-1.0, _origin),
>> heap() {
>> +        point_enumerator_t(vector_t _origin, int _base, int _n_dp) :
>> origin(_origin), rounding_fac(pow((double)_base, _n_dp)), last(-1.0,
>> _origin), heap() {
>>              for (size_t i = 0; i < (1 << 3); ++i) {
>>                vector_t t = origin;
>>                for (size_t j = 0; j < 3; ++j) {
>> @@ -1527,7 +1527,7 @@ namespace carve {
>>            }
>>
>>            aabb_t getAABB() const {
>> -          std::set<face_t *>::iterator i = faces.begin();
>> +          std::set<face_t *>::const_iterator i = faces.begin();
>>              aabb_t aabb = (*i)->getAABB();
>>              while (++i != faces.end()) {
>>                aabb.unionAABB((*i)->getAABB());