griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
76,572 Commits 1 Branch 0 Tags
67cf4cb5ec1e0f964fe41fa6aae80ffceedbf939
Commit Graph

1631 Commits

Author SHA1 Message Date
Sybren A. Stüvel
3b6a0f5fe0 Modifiers: ported Surface DerivedMesh → Mesh 2018-05-17 16:21:13 +02:00
Sybren A. Stüvel
a2438373b3 Modifiers: ported Collision DerivedMesh → Mesh 2018-05-17 15:28:51 +02:00
Sybren A. Stüvel
c48a3afb16 Collision Modifier: get time from depsgraph instead of scene 2018-05-17 15:28:51 +02:00
Sybren A. Stüvel
773a60d8f8 Modifiers: ported Particle Instance DerivedMesh → Mesh 2018-05-17 13:45:47 +02:00
Sybren A. Stüvel
def1c3eb4b Particle System: ported most DerivedMesh → Mesh 
There are a few places where DerivedMesh is still used, most notably
when calling the (not yet ported) cloth simulation. There is also still
the use of Object.derivedDeform and Object.derivedFinal. Those places are
marked with a TODO.

Some functions in the editors module were copied to accept Mesh. Those
already had 'mesh' in the name; the copies are suffixed with '__real_mesh'
for easy renaming later when the DM-based functionality is removed.
 2018-05-16 16:31:38 +02:00
Sybren A. Stüvel
6a4ba9133c Fix T55097: Mesh Deformation modifier is ignoring Vgroup option 2018-05-16 15:19:10 +02:00
Sybren A. Stüvel
dbe4189dcd Save 'deform_only' flag in Mesh.runtime 
This flag is copied when converting between DM and Mesh.

This flag is set to true in get_mesh(), to mimick the behaviour of
CDDM_from_mesh_ex. This is necessary for the particle system to work
correctly.
 2018-05-16 12:41:48 +02:00
Bastien Montagne
e5b53fb28c Some cleanup in modifiers' mesh copying. 2018-05-14 14:34:00 +02:00
Brecht Van Lommel
7a2e271e54 Fix compiler warnings. 2018-05-13 14:48:55 +02:00
Campbell Barton
dcc55c89fa Modifiers: port Remesh from DerivedMesh to Mesh 
D3331 by @alikendarfen
 2018-05-12 09:33:30 +02:00
Campbell Barton
df2de43459 Modifiers: ported Wave from DerivedMesh to Mesh 
D3350 by @alikendarfen
 2018-05-12 09:22:34 +02:00
Campbell Barton
4dc91ebf81 Merge branch 'master' into blender2.8 2018-05-12 08:22:03 +02:00
Campbell Barton
c84b8d4801 Cleanup: modifier arg wrapping 2018-05-12 08:04:56 +02:00
Christian Hubert
054d837e65 Modifiers: ported Laplacian Deform DerivedMesh → Mesh 
Reviewers: sybren

Differential Revision: https://developer.blender.org/D3326
 2018-05-11 18:10:21 +02:00
Christian Hubert
68b736ce24 Modifiers: ported Laplacian Smooth DerivedMesh → Mesh 
Reviewers: sybren

Differential Revision: https://developer.blender.org/D3340
 2018-05-11 16:52:01 +02:00
Christian Hubert
b5beb660b3 Modifiers: ported UV Project DerivedMesh → Mesh 
Reviewers: sybren

Tags: #bf_blender_2.8

Differential Revision: https://developer.blender.org/D3316
 2018-05-11 15:30:01 +02:00
Christian Hubert
af5428aa2b Modifiers: ported Screw DerivedMesh → Mesh 
Reviewers: sybren

Differential Revision: https://developer.blender.org/D3315
 2018-05-11 14:43:37 +02:00
Christian Hubert
17ac0e824b Modifiers: ported Corrective Smooth DerivedMesh → Mesh 
Reviewers: sybren

Differential Revision: https://developer.blender.org/D3339
 2018-05-11 11:27:04 +02:00
Christian Hubert
e0a41fd0ce Modifiers: ported Decimate DerivedMesh → Mesh 
Two things to indicate (which als apply before the DM → M port):

- Face count in the UI is not updated and stays at 0
- When planar mode is used, the result is inverted (mirrored along X)
  compared to 2.79

Reviewers: sybren

Differential Revision: https://developer.blender.org/D3303
 2018-05-11 11:12:28 +02:00
Sybren A. Stüvel
4fe5a105f6 Fix bad pointer cast when modifier is used on non-mesh object 2018-05-11 10:14:35 +02:00
Campbell Barton
83a83a3d4b Cleanup: whitespace, duplicate includes 2018-05-11 07:43:20 +02:00
Christian Hubert
c67a0580fc Modifiers: ported Triangulate DerivedMesh → Mesh 
Reviewers: sybren

Differential Revision: https://developer.blender.org/D3237
 2018-05-09 16:14:22 +02:00
Christian Hubert
ed23bd5f3c Modifiers: ported Boolean DerivedMesh → Mesh 
Reviewers: sybren

Differential Revision: https://developer.blender.org/D3236
 2018-05-09 15:49:55 +02:00
Christian Hubert
65b0d31eb8 Modifiers: ported Hook DerivedMesh → Mesh 
Differential Revision: https://developer.blender.org/D3235
 2018-05-09 14:45:27 +02:00
Bastien Montagne
74234688de Modifier stack: ShrinkWrap: move to mesh-based BVHTree code. 
Now only subsurf still needs some DM...
 2018-05-09 12:51:53 +02:00
Bastien Montagne
e53cf14280 Cleanup/refactor: Move get_mesh_eval_for_modifier from MOD_util to BKE_modifier. 
Because some modifiers' actual code is in BKE... Also renamed to more
BKE-valid name BKE_modifier_get_evaluated_mesh_from_object.
 2018-05-09 12:47:23 +02:00
Sybren A. Stüvel
1cc7d7d5ec Surface Deform mod: removed some stuff that shouldn't have been committed 2018-05-09 12:41:32 +02:00
Sybren A. Stüvel
2862b58a38 Mesh Deform modifier: also show result while editing the deformation mesh 
There is still an issue with the modified mesh not being updated until you
disable and re-enable the modifier. However, after that it'll now also work
while editing the deformation mesh.
 2018-05-09 12:39:52 +02:00
Sybren A. Stüvel
632755a3b1 Modifiers: ported Surface Deform to Mesh 
The modifier performed the 'bind' operation not in the bind operator,
but delayed in the mesh evaluation. This saved the result in a CoW copy
instead of in the actual modifier data. The binding operator now follows
the same approach as Mesh Deform: it forces the modifiers to run on the
real (non-CoW) data, making it possible for the modifier to store the
binding data.

This commit also ports the usage of DerivedMesh to Mesh.
 2018-05-09 12:17:24 +02:00
Bastien Montagne
d152a326f9 Modifier stack: remove last usage of DM in WeightVGProximity . 2018-05-09 10:11:10 +02:00
Bastien Montagne
9a055d1abc Modifier stack: partial port of ShrinkWrap to new Mesh-based system. 
Partial only, complete depends on BVHTree helper updates, and subsurf
updates.
 2018-05-08 19:04:12 +02:00
Bastien Montagne
f7727b5366 Modifier stack: Port Warp to new Mesh-based system. 2018-05-08 18:41:43 +02:00
Bastien Montagne
8f7e4b314b Modifier stack: port Mask to new Mesh-based system. 2018-05-08 18:19:28 +02:00
Bastien Montagne
5f2a2e048d Modifier stack: Port Caqst to new Mesh-based system. 2018-05-08 17:52:53 +02:00
Campbell Barton
03dd109a84 Cleanup: consistent BKE_mesh naming 2018-05-08 17:28:43 +02:00
Campbell Barton
0e964afaa4 Cleanup: use 'nomain' when not in library data 
Rename only.
 2018-05-08 17:06:30 +02:00
Campbell Barton
fa69ce9e3a Cleanup: whitespace, duplicate includes 2018-05-08 16:57:07 +02:00
Bastien Montagne
5b3559576d Modifier stack: Port Smooth to new Mesh-based system. 2018-05-08 16:42:01 +02:00
Bastien Montagne
43be434310 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/modifiers/intern/MOD_dynamicpaint.c
	source/blender/modifiers/intern/MOD_uvproject.c
 2018-05-08 16:06:32 +02:00
Bastien Montagne
43e0e8defa Fix (unreported) bloody modifiers messing with ID user count in copy. 
User count of IDs is handled by higher-level, generic function,
low-level copydata functions *MUST NOT* touch them anymore, ever!
 2018-05-08 15:27:10 +02:00
Bastien Montagne
53a56b7b6c Merge branch 'master' into blender2.8 2018-05-08 15:20:18 +02:00
Bastien Montagne
3740f7593d Cleanup: Nuke empty dummy wrappers around modifier_copyData_generic(). 
This also changes signature of modifier copy callback, first (source)
parameter is now a const, which is saner anyway!
 2018-05-08 15:04:10 +02:00
Bastien Montagne
b857b8f4c4 Merge branch 'master' into blender2.8 2018-05-08 14:22:46 +02:00
Bastien Montagne
49fe27ee46 Modifiers: sanitize/cleanup modifiers' copying & freeing code. 
Should also fix T55000: Crash with hooks and curves in Cycles render.
 2018-05-08 14:22:14 +02:00
Bastien Montagne
c51b017a1a WeightVG modifiers: Cleanup, add asserts to validate expected data status... 2018-05-08 12:58:48 +02:00
Sybren A. Stüvel
002dcd2001 Modifiers: pass the ob->data to the modifier if the mesh param is NULL 
This enables the modifiers to access things like vertex groups. Care should
be taken to not modifier the mesh itself in this case.
 2018-05-08 12:34:06 +02:00
Bastien Montagne
d8706f5407 Modifier stack: port Displace to new Mesh-based system. 2018-05-08 12:01:06 +02:00
Bastien Montagne
cd5b57b4fc Fix recent Curve porting: mesh pointer may also be NULL in non-EditMode case. 2018-05-08 12:01:06 +02:00
Bastien Montagne
0cd3412d4c Mod_util: Add back vcos parameter to get_texture_coords_mesh(). 
Now we use vcos when provided, and fall back to mesh vertices' co
otherwise.

Deform modifiers usually do not have up-to-date coordinates in Mesh
itself, only in given vcos array!
 2018-05-08 12:01:06 +02:00
Sybren A. Stüvel
1c0be0e90f Ported Mesh Deform modifier 
This modifier still has issues that are not related to this port:

- While editing the deformation mesh, the deformed mesh doesn't update.
  This update only happens after exiting edit mode, making editing
  cumbersome.
- Binding doesn't work yet. It works fine when binding in master and
  loading pre-bound in 2.8. This was also an issue before this port, and
  will be investigated separately.
 2018-05-08 11:46:28 +02:00