← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to source/blender/bmesh/operators/bmo_hull.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/bmesh/operators/bmo_hull.c
22
22
 
23
23
/** \file blender/bmesh/operators/bmo_hull.c
24
24
 *  \ingroup bmesh
 
25
 *
 
26
 * Create a convex hull using bullet physics library.
25
27
 */
26
28
 
27
29
#ifdef WITH_BULLET
29
31
#include "MEM_guardedalloc.h"
30
32
 
31
33
#include "BLI_array.h"
32
 
#include "BLI_ghash.h"
33
34
#include "BLI_listbase.h"
34
35
#include "BLI_math.h"
35
 
#include "BLI_utildefines.h"
36
36
 
37
37
#include "Bullet-C-Api.h"
38
38
 
39
39
/* XXX: using 128 for totelem and pchunk of mempool, no idea what good
40
40
 * values would be though */
41
 
#include "BLI_mempool.h"
42
41
 
43
42
#include "bmesh.h"
44
43
 
154
153
                                const int next = (i == 2 ? 0 : i + 1);
155
154
                                BMEdge *e = BM_edge_exists(t->v[i], t->v[next]);
156
155
                                if (e &&
157
 
                                        BMO_elem_flag_test(bm, e, HULL_FLAG_INPUT) &&
158
 
                                        !BMO_elem_flag_test(bm, e, HULL_FLAG_HOLE)) {
 
156
                                    BMO_elem_flag_test(bm, e, HULL_FLAG_INPUT) &&
 
157
                                    !BMO_elem_flag_test(bm, e, HULL_FLAG_HOLE))
 
158
                                {
159
159
                                        BMO_elem_flag_enable(bm, e, HULL_FLAG_OUTPUT_GEOM);
160
160
                                }
161
161
                        }