griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
77,478 Commits 1 Branch 0 Tags
160cb9a28477ccd1d8bdbf5265464dfdbea09d2c
Commit Graph

1661 Commits

Author SHA1 Message Date
Bastien Montagne
70f8eaf1b7 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/space_view3d/drawobject.c
 2018-06-09 15:18:21 +02:00
Bastien Montagne
638de72277 Cleanup: remove some G.main usages. 2018-06-09 15:17:04 +02:00
Sybren A. Stüvel
0c7fc3a961 Alembic import: assign cache_file handle to original datablock 2018-06-08 13:52:53 +02:00
Sybren A. Stüvel
5b0f96f97c Alembic import: port DerivedMesh → Mesh 2018-06-07 10:48:52 +02:00
Campbell Barton
ba80d8440f Cleanup: style 2018-06-06 22:17:06 +02:00
Sybren A. Stüvel
a9ed50514c Moved function declarations from BKE_mesh.h → BKE_mesh_runtime.h 2018-06-05 16:59:18 +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
Sybren A. Stüvel
4fccb8a023 Boolean modifier: fixed crash when applying the modifier 2018-06-01 17:35:26 +02:00
Brecht Van Lommel
719e782f2c Modifiers: tiny optimizations for mesh deform, lattice, kdop. 2018-06-01 12:00:11 +02:00
Sybren A. Stüvel
0bddf5315f Fix T55282: Modifiers: Removed unnecessary object evaluation 2018-06-01 11:50:53 +02:00
Sybren A. Stüvel
8f24d404fe Removed old mention of CDDerivedMesh 2018-06-01 11:50:53 +02:00
Sybren A. Stüvel
c338ac9454 Modifiers: ported Soft Body DerivedMesh → Mesh 
The simulation doesn't seem to update properly yet.
 2018-06-01 10:04:46 +02:00
Bastien Montagne
b809340960 Merge branch 'master' into blender2.8 
Conflicts:
	intern/cycles/blender/blender_curves.cpp
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/modifier.c
	source/blender/blenkernel/intern/object_update.c
	source/blender/blenkernel/intern/particle_system.c
	source/blender/editors/object/object_modifier.c
	source/blender/editors/physics/physics_fluid.c
	source/blender/makesrna/intern/rna_particle.c
	source/blender/modifiers/intern/MOD_particlesystem.c
 2018-05-31 15:37:15 +02:00
Bastien Montagne
b53d358261 Cleanup: remove G.main from BKE modifier. 2018-05-31 15:24:30 +02:00
Bastien Montagne
28369f725c Cleanup: remove G.main from BKE object 
Had to add some G.main to modifiers, but in 2.8 we do not need that
anymore, so it's not that bad! ;)
 2018-05-31 12:27:47 +02:00
Campbell Barton
1f693aefca Cleanup: style/whitespace 
Also use 'uint'.
 2018-05-30 19:49:33 +02:00
Sergey Sharybin
7661f8a65b Modifiers: Bring back custom data referencing logic 
Brings dependency graph evaluation time to similar time than 2.79
for file reported in T55228.
 2018-05-30 17:00:47 +02:00
Sergey Sharybin
25d4d43491 Modifiers: Restore duplication of referenced layers 
Was no reason to remove those calls, it was always a plan to bring
referenced layers back eventually.
 2018-05-30 17:00:47 +02:00
Bastien Montagne
292125bfd3 Fix broken meshdeform modifier after recent cleanup. 2018-05-30 14:02:28 +02:00
Bastien Montagne
72f4ac99c7 Cleanup/fix wrong modifiers targets handling in COW context. 
Modifiers stack only get COW/evaluated IDs, so no need to go auery again
DEG for those. Further more, now unified handling of EditBMesh case (was
done on case-by-case basis in a few modifiers, not all for some reason).

We are still missing the ability to get final and cage deformed meshes
when in Edit mode though, this is to be defined/implemented in depsgraph.
 2018-05-30 12:04:06 +02:00
Brecht Van Lommel
c9f7a3b32a Fix T55207, fix T55208: hair not positioned correctly after subsurf. 
The problem was that the particle system modifier was reading ob->derivedDeform
during modifier stack evaluation. Due to the mesh -> DM conversion this was no
longer set leading to wrong results.

In fact we don't really need the deformed mesh, just the original mesh topology
for face/poly index remapping. So the solution is to use that instead.
 2018-05-25 23:20:20 +02:00
Dalai Felinto
fbc65c6b28 Fix T55165: Driving camera lens with property behaves unexpectedly 
Differential Revision: https://developer.blender.org/D3438
 2018-05-25 12:48:33 +02:00
Dalai Felinto
e8c8ff4f86 Fix all modifiers that depended on BKE_modifier_get_evaluated_mesh_from_object 
This fix applying the following modifiers:
* Boolean (working already)
* Array
* Mesh Deform
* Surface Deform
* Vertex Weight Proximity

This function was to return evaluated mesh. So it should get the evaluated
object at all times. So in this case it makes more sense to simply pass the
depsgraph (or in this case the ModifierEvalContext that contains both the
depsgraph and the flag.

Solution discussed with Bastien Montagne.
 2018-05-24 16:43:21 +02:00
Dalai Felinto
ec809d0cbf Fix boolean modifier when objects have transformations 
Follow up for 9406a1f195.
 2018-05-24 15:56:50 +02:00
Dalai Felinto
9406a1f195 Fix cannot apply boolean modifier 2018-05-24 15:26:31 +02:00
Campbell Barton
84c3b175f6 Fix typo in header 2018-05-23 17:13:41 +02:00
Bastien Montagne
0cc2666605 Fix last usages of Scene.r.cfra in modifiers code. 
Note that some modifiers-related code in BKE still uses that...
 2018-05-23 16:37:36 +02:00
Bastien Montagne
4a2213dc9a Fix modifiers not using depsgraph time for texture evaluation. 
Texture animation seems to be broken anyway currently, but at leat
modifier side it should now be OK.
 2018-05-23 15:55:13 +02:00
Sybren A. Stüvel
f5d911f8b0 Modifiers: ported Cloth DerivedMesh → Mesh 
The modifier is still quite slow; this could be due to caches being written
to a CoW datablock instead of the original one. More investigation is
needed.
 2018-05-22 17:11:30 +02:00
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