Blender Git Loki

Merge branch 'master' into dyntopo_holes

Conflicts:
source/blender/blenkernel/intern/pbvh_bmesh.c

Merge branch 'master' into dyntopo_holes

Bulge brush: experimental flipping based on normal

gives useful results painting holes

Fix for alloc size (again!)

Sculpt: remove degenerate geometry around holes

Remove sharp edges whos faces make low volume tetrahedrons

merge pairs based on distance to brush

not logical but works nice-ish

Correct allocation size (old mistake from past added back)

Experimental options for sculpting holes

- don't bridge loops with shared vertices (USE_BRIDGE_STRICT)
- cleanup dangling faces after making the bridge (USE_BRIDGE_CLEAN)

Cycles / CUDA: Change inline rules for BVH intersection functions.

* On sm_30 and above there is no change (was not inlined already before), this just fixes a speed regression from yesterday. 6359c36ba407
* On sm_2x (tested with sm_21), I get a nice 8% speedup in the bmw scene with this. As a bonus, cubin compilation time and memory usage is significantly reduced. Regular cubin size went from 2.5MB to 2.0MB, Experimental one from 3.8MB to 2.5MB.

BLI_buffer: simplify buffer resize

Cycles / CUDA: Workaround to make sm_52 (Maxwell) cards work.

* sm_52 can run a sm_50 kernel, so tell runtime detection to use that until we build a dedicated sm_52 kernel.

Merge branch 'master' into dyntopo_holes

Fix for error removing verts that are used to loop over

Cutting adjacent holes now makes a larger hole.

missing from last commit

Fix for face flipping (ensure contiguous)

Fix for creating bridge faces

- Add verts to node (would crash otherwise)
- Edges to bridge could share some verts. (ignore now)

basic bridge support

Merge branch 'master' into dyntopo_holes

Merge branch 'master' into dyntopo_holes

get surrounding verts in-order