griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
80,343 Commits 1 Branch 0 Tags
9901679ce820bb00a3aeecc384fca1a1194d0d87
Commit Graph

354 Commits

Author SHA1 Message Date
Campbell Barton
76d67b4db4 Merge branch 'master' into blender2.8 2018-09-13 17:08:58 +10:00
Campbell Barton
44f719b632 Cleanup: use PyImport_GetModuleDict 
Replace direct access using PyThreadState_GET
 2018-09-13 17:06:07 +10:00
Bastien Montagne
a43ebc63fa Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/intern/collision.c
 2018-09-03 17:44:36 +02:00
Brecht Van Lommel
4da2acae3a Spelling fixes in comments and descriptions, patch by luzpaz. 
Differential Revision: https://developer.blender.org/D3668
 2018-09-03 16:55:01 +02:00
Campbell Barton
60b24f2415 Cleanup: indentation 2018-08-28 11:01:29 +10:00
Andrew Hale
1e6a5eb087 Implement BMesh Operator string enumerators and docs generation. 
Partial implementation of T56496 for review.

Reviewers: campbellbarton

Reviewed By: campbellbarton

Differential Revision: https://developer.blender.org/D3635
 2018-08-27 16:15:54 +02:00
Campbell Barton
441177b1c7 Merge branch 'master' into blender2.8 2018-08-08 11:33:42 +10:00
Campbell Barton
d07d3e0987 Cleanup: indentation 2018-08-08 11:31:28 +10:00
Campbell Barton
6fbd210b91 Merge branch 'master' into blender2.8 2018-08-08 11:05:08 +10:00
Andrew Hale
4c4aa65adb PyAPI: Make skin modifier roots settable 
This make the root flag writable using the Python API, using the
generic skin vertex flag setter function.

Reviewed By: Campbell Barton

Differential Revision: http://developer.blender.org/D3583
 2018-08-06 12:11:35 +02:00
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
646412004b Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/makesrna/intern/rna_image.c
	source/blender/makesrna/intern/rna_object.c
	source/blender/makesrna/intern/rna_object_force.c
	source/blender/makesrna/intern/rna_screen.c
	source/blender/makesrna/intern/rna_sculpt_paint.c
	source/blender/makesrna/intern/rna_space.c
	source/blender/python/bmesh/bmesh_py_types.c
	source/blender/python/generic/bpy_internal_import.h
	source/blender/python/intern/bpy_rna_anim.c
	source/blender/python/intern/gpu_offscreen.c
 2018-06-22 12:46:16 +02:00
Bastien Montagne
cbf5c738d6 Cleanup: get rid of last G.main's in bpy area. 
Essentially 'validating' them as G_MAIN, and adding some asserts in
dubious places, that handled IDs are actually in G_MAIN.
 2018-06-22 11:37:47 +02:00
Campbell Barton
43ce201125 Merge branch 'master' into blender2.8 2018-06-17 11:57:49 +02:00
Campbell Barton
2f1e34cfcc Cleanup: use clamp_* from BLI_math (replace macro) 2018-06-17 11:50:56 +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
7719c11006 Cleanup: strip trailing space in Python module 2018-06-04 08:54:40 +02:00
Campbell Barton
5760c6b25c Merge branch 'master' into blender2.8 2018-05-03 20:24:44 +02:00
Campbell Barton
0f217de403 Fix T54927: BMesh Py error w/ select history slice 2018-05-03 20:23:32 +02:00
Brecht Van Lommel
34ab90f546 Depsgraph: remove EvaluationContext, pass Depsgraph instead. 
The depsgraph was always created within a fixed evaluation context. Passing
both risks the depsgraph and evaluation context not matching, and it
complicates the Python API where we'd have to expose both which is not so
easy to understand.

This also removes the global evaluation context in main, which assumed there
to be a single active scene and view layer.

Differential Revision: https://developer.blender.org/D3152
 2018-04-16 19:55:33 +02:00
Campbell Barton
264691e563 Merge branch 'master' into blender2.8 2018-02-19 17:46:42 +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
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
Brecht Van Lommel
cdc31c3e6e Merge branch 'master' into blender2.8 2018-01-13 02:05:49 +01:00
Campbell Barton
a33a5880f7 Fix bmesh.utils.face_join arg parsing 2018-01-12 14:51:15 +11:00
Dalai Felinto
1cb6cea71c Merge remote-tracking branch 'origin/master' into blender2.8 2017-11-13 11:48:48 -02:00
Campbell Barton
aae8e21100 BMesh Py API: Expose color alpha 2017-11-12 15:48:24 +11:00
Sergey Sharybin
7ea7fd45d0 Merge branch 'master' into blender2.8 2017-10-24 12:19:48 +02:00
Campbell Barton
8661ab12a6 Fix BMesh PyAPI internal flag clearing logic 
Would leave the flag set on raising an exception.
 2017-10-24 16:52:54 +11:00
Brecht Van Lommel
f5456df095 Merge branch 'master' into blender2.8 2017-10-24 02:05:41 +02:00
Campbell Barton
1aa5b63661 Docs: improve bmesh exception message 
Suggested in T53131
 2017-10-23 21:57:32 +11:00
Bastien Montagne
557dc7d343 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/screen/screen_edit.c
 2017-10-12 16:40:35 +02:00
Campbell Barton
b29e37ed81 Docs: add note for bmesh face_split_edgenet 2017-10-12 23:36:42 +11:00
Campbell Barton
572b1a644f Merge branch 'master' into blender2.8 2017-09-05 22:56:03 +10:00
Campbell Barton
85d53620aa Cleanup: avoid confusing assignment 2017-09-04 14:35:35 +10:00
Campbell Barton
32e36a1782 Correct own error simplifying matrix checks 2017-09-03 00:05:11 +10:00
Campbell Barton
2f8c8ec8fb Docs: BMesh.from_mesh behavior w/ multiple calls 2017-08-28 14:25:00 +10:00
Campbell Barton
cb7f1f8160 Docs: BMesh.from_mesh behavior w/ multiple calls 2017-08-28 12:40:36 +10:00
Campbell Barton
f8f6f8f26e Merge branch 'master' into blender2.8 2017-08-25 20:45:16 +10:00
Campbell Barton
738d942d29 Correct error in recent use of PyC_Long_* 
Regression in 46cf33bf0
 2017-08-25 02:09:23 +10:00
Campbell Barton
7497488149 Merge branch 'master' into blender2.8 2017-08-20 15:50:15 +10:00
Campbell Barton
46cf33bf01 PyAPI: Make use of PyC_LongAs... API 
Avoids setting exceptions inline,
also use Matrix_ParseAny for bmesh.ops.

Some inline exceptions are kept because they show useful details.
 2017-08-20 15:49:10 +10:00
Sergey Sharybin
5605c26fcd Fix function declaration of some modifiers 
Those functions did not use evaluation context.

Also fixed lots of unused variables warnings caused by commented out code which
needs to be ported away from DerivedMesh and to evaluation context.
 2017-07-21 15:54:42 +02:00
Luca Rood
1c4c288727 Pass EvaluationContext argument everywhere 
Note that some little parts of code have been dissabled because eval_ctx
was not available there. This should be resolved once DerivedMesh is
replaced.
 2017-07-21 14:47:26 +02:00
Campbell Barton
819f3b37da BMesh face map layer access 2017-07-20 19:52:26 +10:00
Campbell Barton
bdbf4471a6 TexFace removal part 3 
- MTexPoly structure & layer type.
- The 'Mesh.uv_textures' layers.
- DerivedMesh TexFace drawing.
- Scripts & UI.
 2017-05-25 15:19:58 +10:00