griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
78,567 Commits 1 Branch 0 Tags
10b976d2eb8a5de24c19bbb469005d59c6cd7c17
Commit Graph

961 Commits

Author SHA1 Message Date
Campbell Barton
9bd0c63382 Merge branch 'master' into blender2.8 2018-06-29 08:05:38 +02:00
Campbell Barton
af36dd4664 Cleanup: trailing newlines 2018-06-29 08:02:49 +02:00
Bastien Montagne
4943739b89 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/mesh/editmesh_utils.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
 2018-06-13 16:42:56 +02:00
Bastien Montagne
f61c30f804 Cleanup: get rid of last G.main in BMesh code. 2018-06-13 16:29:12 +02:00
Campbell Barton
5b64301834 Merge branch 'master' into blender2.8 2018-06-04 09:06:14 +02:00
Campbell Barton
854db8951b Cleanup: strip trailing space in bmesh module 2018-06-04 08:49:47 +02:00
Campbell Barton
bfe1d0e0dc Merge branch 'master' into blender2.8 2018-06-01 18:26:42 +02:00
Campbell Barton
75fc1c3507 Cleanup: trailing whitespace (comment blocks) 
Strip unindented comment blocks - mainly headers to avoid conflicts.
 2018-06-01 18:19:39 +02:00
Campbell Barton
66d18d93c4 Merge branch 'master' into blender2.8 2018-05-22 17:24:32 +02:00
Campbell Barton
76ece90d4a Fix T55093: Bisect + fill crash 2018-05-22 17:23:25 +02:00
Campbell Barton
9a11aeb300 Merge branch 'master' into blender2.8 2018-04-16 17:24:20 +02:00
Campbell Barton
85de548e03 Cleanup: indentation 2018-04-16 17:08:27 +02:00
Campbell Barton
b65ea517eb Merge branch 'master' into blender2.8 
- Undo that changes modes currently asserts,
  since undo is now screen data.

  Most likely we will change how object mode and workspaces work
  since it's not practical/maintainable at the moment.

- Removed view_layer from particle settings
  (wasn't needed and complicated undo).
 2018-04-01 11:03:25 +02:00
Campbell Barton
91d0825b55 BLI_sort_utils: add pointer sorting callback 
Also rename Pointer -> Ptr
 2018-03-31 19:25:27 +02:00
Bastien Montagne
9009622b54 Merge branch 'master' into blender2.8 2018-03-14 18:10:31 +01:00
Campbell Barton
342593f124 Cleanup: rename BLI_array_count -> len 
Match naming convention used everywhere else.
Count should only be used when this isn't directly accessible.
 2018-03-15 01:53:20 +11:00
Campbell Barton
264691e563 Merge branch 'master' into blender2.8 2018-02-19 17:46:42 +11:00
Campbell Barton
860939ccc2 Cleanup: remove BMeshToMeshParams.calc_tessface 
This wasn't used, tessface is being phased out.
Caller can run explicitly if needed.
 2018-02-19 17:41:37 +11:00
Campbell Barton
05f3e245a8 Fix T54098: Crash existing /w dyntopo sculpt 
Optionally don't remap indices for objects.

Checking all objects parent's would reference a freed pointer
while freeing all objects.

In the case of dynamic topology there is no use in keeping track
of hook/vertex-parent indices.

Also disable this when creating meshes for undo storage
since adding an undo step shouldn't be modifying other objects.
 2018-02-19 17:34:30 +11:00
Campbell Barton
2bc952fdb6 Merge branch 'master' into blender2.8 2018-02-18 22:33:05 +11:00
Campbell Barton
deacb3d6b8 Cleanup: add 2d suffix to BLI files 
Some of these API's can have 3D versions, explicitly name them 2D.
 2018-02-18 21:27:33 +11:00
Sergey Sharybin
df1c88b652 Merge branch 'master' into blender2.8 2018-02-15 14:15:55 +01:00
Campbell Barton
ccdacf1c9b Cleanup: use '_len' instead of '_size' w/ BLI API 
- When returning the number of items in a collection use BLI_*_len()
- Keep _size() for size in bytes.
- Keep _count() for data structures that don't store length
  (hint this isn't a simple getter).

See P611 to apply instead of manually resolving conflicts.
 2018-02-15 23:39:08 +11:00
Campbell Barton
e4c9cf7088 Merge branch 'master' into blender2.8 2018-02-01 14:02:33 +11:00
Campbell Barton
078e012cd9 Cleanup: rename BLI_*_empty() -> clear() 
Consistent with other BLI API's
 2018-02-01 13:40:53 +11:00
Campbell Barton
e8452cf0bc Merge branch 'master' into blender2.8 2018-01-18 14:11:38 +11:00
Campbell Barton
2be8598fe7 Fix T53811: "bmesh.ops.split" crash 2018-01-18 12:36:25 +11:00
Campbell Barton
873a87c7e8 Merge branch 'master' into blender2.8 2018-01-16 14:56:03 +11:00
Campbell Barton
e428ea3e00 Cleanup: indentation 2018-01-16 11:40:43 +11:00
Campbell Barton
1b2f8b2754 Merge branch 'master' into blender2.8 2017-12-04 16:51:07 +11:00
Campbell Barton
d47d263b4b Cleanup: style 2017-12-04 16:37:31 +11:00
Bastien Montagne
de09366d57 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/mask/mask_draw.c
 2017-11-26 20:29:56 +01:00
Campbell Barton
311da4cd16 Cleanup: rename edge -> edges 2017-11-26 20:13:18 +11:00
Campbell Barton
23252eece6 Minor improvement to last commit 
Don't operate on multiple boundaries at once,
instead keep collapsing from the first selected boundary.
 2017-11-26 18:38:45 +11:00
Campbell Barton
329bf8e1bf BMesh: improve edge rotate when edges share faces 
Previously outcome depended on order of edges,
now the longest boundary edges are rotated first,
then the faces connected edges.

This gives more predictable results, allowing regions containing
a vertex fan to be rotated onto the next vertex.
 2017-11-26 17:51:22 +11:00
Campbell Barton
5b225c59bb Cleanup: move edge-rotate into own file 2017-11-26 13:42:25 +11:00
Sergey Sharybin
7ea7fd45d0 Merge branch 'master' into blender2.8 2017-10-24 12:19:48 +02:00
Campbell Barton
c93cfcbb61 Fix edge-split bmesh operator giving empty result 2017-10-24 16:31:35 +11:00
Julian Eisel
147f9585db Merge branch 'master' into blender2.8 2017-10-23 00:04:20 +02:00
Campbell Barton
6dfe4cbc6b Polyfill Beautify: half-edge optimization 
Was using an edge hash for triangle -> edge lookups,
updating triangle indices for each edge-rotation.

Replace this with half-edge which can rotate edges much more simply,
writing triangles back once the solution has been calculated.

Gives ~33% speedup in own tests.
 2017-10-23 01:40:03 +11:00
Sergey Sharybin
63c472b4f9 Merge branch 'master' into blender2.8 2017-10-04 22:18:05 +05:00
Campbell Barton
d1dfed206b Fix T52923: Circle diameter is in fact radius 2017-10-04 18:01:53 +11:00
Sergey Sharybin
af170839af Merge branch 'master' into blender2.8 2017-09-19 21:08:14 +05:00
Campbell Barton
60956397ca Cleanup: BLI_utildefines prefix for header-only libs 
This allows to have different macro headers without them sharing
similar names to regular C modules.
 2017-09-19 20:16:05 +10:00
Campbell Barton
572b1a644f Merge branch 'master' into blender2.8 2017-09-05 22:56:03 +10:00
Campbell Barton
4d148471b6 Fix T52634: EditMesh Remove doubles could hang 
A single diagonal axis was used for sorting coordinates,
the algorithm relied on users not having vertices axis aligned.

Use BLI_kdtree to remove doubles instead.

Overall speed varies, it's more predictable than the previous method.
Some typical tests gave speedup of ~1.4x - 1.7x.
 2017-09-03 23:52:10 +10:00
Campbell Barton
7dfcbe01b0 Merge branch 'master' into blender2.8 2017-09-02 20:08:02 +10:00
Campbell Barton
2ca1f29748 BMesh: use predictable order for remove-doubles 
Each qsort implementation may give different results when values match.

Now fallback to sorting by index.
 2017-09-02 03:30:09 +10:00
Campbell Barton
193d7d6333 Merge branch 'master' into blender2.8 2017-07-17 13:21:05 +10:00
Campbell Barton
49c29dc82f Fix T52066: Grid Mesh UV's aren't correct 2017-07-16 00:03:52 +10:00