blender.git
2 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Thu, 10 May 2018 12:27:24 +0000 (14:27 +0200)]
Merge branch 'master' into blender2.8

2 years ago3D View: utility to get matrix from cursor
Campbell Barton [Thu, 10 May 2018 10:24:07 +0000 (12:24 +0200)]
3D View: utility to get matrix from cursor

2 years agoManipulator: API call to invoke on setup
Campbell Barton [Wed, 9 May 2018 20:43:24 +0000 (22:43 +0200)]
Manipulator: API call to invoke on setup

Needed for manipulators that start out interactive,
similar use-case to modal operators, except these can be tweaked after.

2 years agoManipulator: support direct cage3d adjustment
Campbell Barton [Wed, 9 May 2018 20:37:09 +0000 (22:37 +0200)]
Manipulator: support direct cage3d adjustment

Scale cage relied on transform code,
this adds support for the manipulator corners being modified directly.

2 years agoCleanup: Remove redundant bvh_cache initialization.
Germano [Wed, 9 May 2018 16:28:59 +0000 (13:28 -0300)]
Cleanup: Remove redundant bvh_cache initialization.

2 years agoClay: Cleanup, reduce indentation level
Sergey Sharybin [Wed, 9 May 2018 14:45:04 +0000 (16:45 +0200)]
Clay: Cleanup, reduce indentation level

2 years agoEevee: Cleanup, use NULL instead of static matrix
Sergey Sharybin [Wed, 9 May 2018 14:42:15 +0000 (16:42 +0200)]
Eevee: Cleanup, use NULL instead of static matrix

Those are the same thing now. So no need to keep initializing matrix
over and over.

2 years agoCorrect previous commit
Sergey Sharybin [Wed, 9 May 2018 14:38:38 +0000 (16:38 +0200)]
Correct previous commit

2 years agoEevee: Cleanup, reduce indentation level
Sergey Sharybin [Wed, 9 May 2018 14:36:09 +0000 (16:36 +0200)]
Eevee: Cleanup, reduce indentation level

2 years agoWorkbench: Make hair populating function shorter and nicer
Sergey Sharybin [Wed, 9 May 2018 14:20:38 +0000 (16:20 +0200)]
Workbench: Make hair populating function shorter and nicer

2 years agoDepsgraph: Tag object for copy-on-write update when toggling particle edit mode
Sergey Sharybin [Wed, 9 May 2018 14:15:40 +0000 (16:15 +0200)]
Depsgraph: Tag object for copy-on-write update when toggling particle edit mode

2 years agoDepsgraph: Remove particle edit code from evaluation
Sergey Sharybin [Wed, 9 May 2018 13:44:49 +0000 (15:44 +0200)]
Depsgraph: Remove particle edit code from evaluation

Everything seems to be working without this, which makes since there is no
evaluation-time edit code in master. The only tricky part here would be that
this means we might want to ensure edit structure exists from inside particle
mode in draw manager.

Other point for not having this code in evaluation is that it's possible to
have same object evaluated in different contexts at the same time, and since
edit structures are supposed to be in original object we might run into
threading conflict.

2 years agoParticle edit mode: Make selection settings to work with CoW
Sergey Sharybin [Wed, 9 May 2018 13:37:41 +0000 (15:37 +0200)]
Particle edit mode: Make selection settings to work with CoW

2 years agoRename: RNA_property_override_status > RNA_property_static_override_status
Dalai Felinto [Wed, 9 May 2018 14:17:15 +0000 (16:17 +0200)]
Rename: RNA_property_override_status > RNA_property_static_override_status

2 years agoModifiers: ported Triangulate DerivedMesh → Mesh
Christian Hubert [Wed, 9 May 2018 14:00:12 +0000 (16:00 +0200)]
Modifiers: ported Triangulate DerivedMesh → Mesh

Reviewers: sybren

Differential Revision: https://developer.blender.org/D3237

2 years agoFix T55015: Crash on selection after recent BVH changes
Dalai Felinto [Wed, 9 May 2018 13:38:58 +0000 (15:38 +0200)]
Fix T55015: Crash on selection after recent BVH changes

Runtime data should always be initialized to NULL on read-time.

2 years agoFix broken 'check/validate libs' code with indirect libs.
Bastien Montagne [Wed, 9 May 2018 13:46:22 +0000 (15:46 +0200)]
Fix broken 'check/validate libs' code with indirect libs.

Readcode always set relative paths of indirectly linked libs relative to
*current* .blend file, not to the library using it.

But BKE_library_filepath_set was then setting them relative to their
parent library, breaking checking code (and saved files even :((( ).

2 years agoModifiers: ported Boolean DerivedMesh → Mesh
Christian Hubert [Wed, 9 May 2018 12:55:56 +0000 (14:55 +0200)]
Modifiers: ported Boolean DerivedMesh → Mesh

Reviewers: sybren

Differential Revision: https://developer.blender.org/D3236

2 years agoExpanded BMALLOC_TEMPLATE_FROM_ME to accept two meshes
Sybren A. Stüvel [Wed, 9 May 2018 13:15:06 +0000 (15:15 +0200)]
Expanded BMALLOC_TEMPLATE_FROM_ME to accept two meshes

2 years agoOutliner: move filter options to popover.
Brecht Van Lommel [Wed, 9 May 2018 11:40:34 +0000 (13:40 +0200)]
Outliner: move filter options to popover.

2 years agoT55014: Optionally: objects not cast shadows in workbench
Jeroen Bakker [Wed, 9 May 2018 13:13:12 +0000 (15:13 +0200)]
T55014: Optionally: objects not cast shadows in workbench

2 years agoMerge branch 'master' into blender2.8
Philipp Oeser [Wed, 9 May 2018 13:08:13 +0000 (15:08 +0200)]
Merge branch 'master' into blender2.8

2 years agoDraw manager: Implement point selection modes for particle edit mode
Sergey Sharybin [Wed, 9 May 2018 12:59:29 +0000 (14:59 +0200)]
Draw manager: Implement point selection modes for particle edit mode

2 years agoDraw manager: Initial implementation of key points visualization
Sergey Sharybin [Wed, 9 May 2018 12:08:44 +0000 (14:08 +0200)]
Draw manager: Initial implementation of key points visualization

Does all points all the time, ignoring the setting in viewport header.
This is to be addressed by the next commit.

2 years agoDraw manager: Start using more explicit API for particle edit mode
Sergey Sharybin [Wed, 9 May 2018 09:14:27 +0000 (11:14 +0200)]
Draw manager: Start using more explicit API for particle edit mode

2 years agoModifiers: ported Hook DerivedMesh → Mesh
Christian Hubert [Wed, 9 May 2018 10:38:52 +0000 (12:38 +0200)]
Modifiers: ported Hook DerivedMesh → Mesh

Differential Revision: https://developer.blender.org/D3235

2 years agoFix T54992: Lattice modifier on another Lattice object does not take the
Philipp Oeser [Tue, 8 May 2018 09:05:42 +0000 (11:05 +0200)]
Fix T54992: Lattice modifier on another Lattice object does not take the
Influence vertexgroup into account

2 years agoBKE_id_free(): avoid UI and DEG calls when tagged with LIB_TAG_NO_MAIN
Sybren A. Stüvel [Wed, 9 May 2018 12:36:04 +0000 (14:36 +0200)]
BKE_id_free(): avoid UI and DEG calls when tagged with LIB_TAG_NO_MAIN

This prevents threading issues & crashes from modifiers that create
temporary meshes.

2 years agoMerge branch 'master' into blender2.8
Philipp Oeser [Wed, 9 May 2018 12:37:25 +0000 (14:37 +0200)]
Merge branch 'master' into blender2.8

2 years agoEditMesh: multi-edit merge
Campbell Barton [Wed, 9 May 2018 12:32:15 +0000 (14:32 +0200)]
EditMesh: multi-edit merge

D3226 by @pragma37

Note: edited so first/last option only applies to active mesh
since this doesn't make much sense to apply across objects.

2 years agoFix T54997: simple typo in property description
Philipp Oeser [Wed, 9 May 2018 12:26:47 +0000 (14:26 +0200)]
Fix T54997: simple typo in property description

2 years agoFix crash moving grease pencil frames
Campbell Barton [Wed, 9 May 2018 12:09:05 +0000 (14:09 +0200)]
Fix crash moving grease pencil frames

2 years agoCleanup: unused vars
Campbell Barton [Wed, 9 May 2018 12:08:56 +0000 (14:08 +0200)]
Cleanup: unused vars

2 years agoCleanup: quiet shadow warning
Campbell Barton [Wed, 9 May 2018 11:53:01 +0000 (13:53 +0200)]
Cleanup: quiet shadow warning

2 years agoMulti-object edit: MESH_OT_beautify_fill by Remi van der Laan
Dalai Felinto [Wed, 9 May 2018 11:42:31 +0000 (13:42 +0200)]
Multi-object edit: MESH_OT_beautify_fill by Remi van der Laan

Maniphest Tasks: T54643, T54641
Differential Revision: https://developer.blender.org/D3291

2 years agoMulti-object edit: MESH_OT_loop_multi_select by Oleg
Dalai Felinto [Wed, 9 May 2018 11:39:05 +0000 (13:39 +0200)]
Multi-object edit: MESH_OT_loop_multi_select by Oleg

Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3245

2 years agoT55008: Migrating RE-Collection data to Scene data
Jeroen Bakker [Wed, 9 May 2018 11:30:27 +0000 (13:30 +0200)]
T55008: Migrating RE-Collection data to Scene data

in Scene DNA is available in scene.display New DNA Struct DisplayData
Added RNA (scene.display).

We already have scene.display_settings which contains non viewpoert
specific color management settings. I did not merge those two.

Patch should be in line with the ideas that @brecht wrote in T55008.

As I am not in detail aware of the decisions that have been made for the override feature I want a short review if it is in line with the plans.

Reviewers: brecht, dfelinto

Reviewed By: brecht

Subscribers: brecht

Tags: #code_quest, #bf_blender_2.8

Differential Revision: https://developer.blender.org/D3290

2 years agoMulti object edit: MESH_OT_region_to_loop by Oleg
Dalai Felinto [Wed, 9 May 2018 11:02:25 +0000 (13:02 +0200)]
Multi object edit: MESH_OT_region_to_loop by Oleg

Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3248

2 years agoMulti-Object Pose: POSE_OT_select_parent by Harsha
Dalai Felinto [Wed, 9 May 2018 10:48:35 +0000 (12:48 +0200)]
Multi-Object Pose: POSE_OT_select_parent by Harsha

Differential Revision: https://developer.blender.org/D3283

2 years agoModifier stack: ShrinkWrap: move to mesh-based BVHTree code.
Bastien Montagne [Wed, 9 May 2018 10:51:03 +0000 (12:51 +0200)]
Modifier stack: ShrinkWrap: move to mesh-based BVHTree code.

Now only subsurf still needs some DM...

2 years agoRemove Frame Server
Campbell Barton [Wed, 9 May 2018 10:43:16 +0000 (12:43 +0200)]
Remove Frame Server

This feature is limited (only byte PPM output, no multi-view),
only works with specific configurations.

This also causes some maintenance overhead
when testing changes to the render pipeline.

2 years agoCleanup/refactor: Move get_mesh_eval_for_modifier from MOD_util to BKE_modifier.
Bastien Montagne [Wed, 9 May 2018 10:44:22 +0000 (12:44 +0200)]
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.

2 years agoSurface Deform mod: removed some stuff that shouldn't have been committed
Sybren A. Stüvel [Wed, 9 May 2018 10:41:32 +0000 (12:41 +0200)]
Surface Deform mod: removed some stuff that shouldn't have been committed

2 years agoMesh Deform modifier: also show result while editing the deformation mesh
Sybren A. Stüvel [Wed, 9 May 2018 10:23:10 +0000 (12:23 +0200)]
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.

2 years agoFix (unreported) bug in BVHTree 'free tessfaces' flag setting.
Bastien Montagne [Wed, 9 May 2018 10:36:05 +0000 (12:36 +0200)]
Fix (unreported) bug in BVHTree 'free tessfaces' flag setting.

Same issue as in DM-based on, so follow up of rBf3efa9e15f58...

2 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Wed, 9 May 2018 10:35:16 +0000 (12:35 +0200)]
Merge branch 'master' into blender2.8

2 years agoFix (unreported) bug in BVHTree 'free tessfaces' flag setting.
Bastien Montagne [Wed, 9 May 2018 10:33:21 +0000 (12:33 +0200)]
Fix (unreported) bug in BVHTree 'free tessfaces' flag setting.

Could lead to atempt to free NULL pointer, and/or memory leak.

2 years agoModifiers: ported Surface Deform to Mesh
Sybren A. Stüvel [Wed, 9 May 2018 09:33:32 +0000 (11:33 +0200)]
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.

2 years agoMulti-Object-Editing: MESH_OT_separate by Nick Milios
Dalai Felinto [Wed, 9 May 2018 10:04:43 +0000 (12:04 +0200)]
Multi-Object-Editing: MESH_OT_separate by Nick Milios

Patch description:

- Reports "Nothing selected" only when all objects has no selection
  and it is in  Separate type(Mode)
- Tested all types (Seperate/By Material/By loose parts)
- Instead of using

```
BKE_view_layer_array_from_objects_in_edit_mode_unique_data
```

I used

```
BKE_view_layer_array_from_bases_in_edit_mode_unique_data
```

Because it needs the "Base" not the "Object" itself.

Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3267

2 years agoMulti-Object-Editing: MESH_OT_vert_connect by Nick Milios
Dalai Felinto [Wed, 9 May 2018 09:37:41 +0000 (11:37 +0200)]
Multi-Object-Editing: MESH_OT_vert_connect by Nick Milios

With changes: Skip loop when totvertsel is not 2

Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3273

2 years agoEditMesh: multi object spin support by Falk David
Fulk33 [Wed, 9 May 2018 09:10:00 +0000 (11:10 +0200)]
EditMesh: multi object spin support by Falk David

Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3279

2 years agoMerge branch 'master' into blender2.8
Campbell Barton [Wed, 9 May 2018 09:25:35 +0000 (11:25 +0200)]
Merge branch 'master' into blender2.8

2 years agoMSVC: resolve near/far issue take2
Campbell Barton [Wed, 9 May 2018 09:20:12 +0000 (11:20 +0200)]
MSVC: resolve near/far issue take2

Previous fix failed w/ compositor,
tested on MSVC2015, full build.

2 years agoMulti-Object-Editing : Support for Grid Fill by Falk David
Dalai Felinto [Wed, 9 May 2018 08:41:37 +0000 (10:41 +0200)]
Multi-Object-Editing : Support for Grid Fill by Falk David

With minor changes:
* Have BMOperator declaration close to its initialization.
* Move const use_prepare and const use_interp_simple outside the for loop.

Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3222

2 years agoMulti-Object-Editing: MESH_OT_edges_select_sharp by Jefferson Rausseo
Dalai Felinto [Wed, 9 May 2018 08:34:52 +0000 (10:34 +0200)]
Multi-Object-Editing: MESH_OT_edges_select_sharp by Jefferson Rausseo

Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3280

2 years agoDraw manager: Initial implementation of particle edit mode
Sergey Sharybin [Tue, 8 May 2018 15:11:42 +0000 (17:11 +0200)]
Draw manager: Initial implementation of particle edit mode

Gets edit more from the current object and displays it as a path.
this is how both hair and particle edit modes are supposed to work.

This only covers path itself, it doesn't do anything like keys
visualization or selection. However, it's already possible to
comb and such.

Only implements particle mode. There are also some settings to
do soft body and cloth. No idea yet what that all is about.

Copy-on-write is not supported either, this is due to some
edit mode ownership problems which are to be addressed from
dependency graph side.

Shading is dead-simple: uses tangent as a color. This is where
i hope to get some help from Clément.

2 years agoDraw manager: Use utility function to get particle edit mode
Sergey Sharybin [Tue, 8 May 2018 15:10:42 +0000 (17:10 +0200)]
Draw manager: Use utility function to get particle edit mode

Makes it more local where we have to do all the tricky checks.

2 years agoDraw manager: Add support for cached particle edit paths
Sergey Sharybin [Tue, 8 May 2018 14:57:08 +0000 (16:57 +0200)]
Draw manager: Add support for cached particle edit paths

Before it was only supporting hair strand paths editing.

2 years agoDraw manager: Correct edit mode check for particles
Sergey Sharybin [Tue, 8 May 2018 14:26:06 +0000 (16:26 +0200)]
Draw manager: Correct edit mode check for particles

2 years agoDraw manager: Ignore particles when object is in particle edit mode
Sergey Sharybin [Tue, 8 May 2018 14:17:33 +0000 (16:17 +0200)]
Draw manager: Ignore particles when object is in particle edit mode

2 years agoDraw manager: allow creation of hair batch cache from edit mode
Sergey Sharybin [Tue, 8 May 2018 14:16:53 +0000 (16:16 +0200)]
Draw manager: allow creation of hair batch cache from edit mode

2 years agoDraw manager: De-duplicate segment counting
Sergey Sharybin [Tue, 8 May 2018 14:09:36 +0000 (16:09 +0200)]
Draw manager: De-duplicate segment counting

2 years agoDraw manager: Completely de-duplicate strands caching for parent and particles
Sergey Sharybin [Tue, 8 May 2018 13:37:23 +0000 (15:37 +0200)]
Draw manager: Completely de-duplicate strands caching for parent and particles

Will make it simple to add strands from edit mode as well.

2 years agoDraw manager: Move parent particle cache fill into an own function
Sergey Sharybin [Tue, 8 May 2018 13:02:11 +0000 (15:02 +0200)]
Draw manager: Move parent particle cache fill into an own function

Should make it fairly simple to make it re-usable by children particles.

2 years agoDraw manager: Use single function to calculate particles UVs
Sergey Sharybin [Tue, 8 May 2018 12:36:11 +0000 (14:36 +0200)]
Draw manager: Use single function to calculate particles UVs

Will allow us to merge two code paths more easily.

2 years agoDraw manager: Move emit_from checks to interpolation functions
Sergey Sharybin [Tue, 8 May 2018 12:26:29 +0000 (14:26 +0200)]
Draw manager: Move emit_from checks to interpolation functions

Keeps main function shorter.

2 years agoDraw manager: Move UVs interpolation of child particles to a function
Sergey Sharybin [Tue, 8 May 2018 12:23:55 +0000 (14:23 +0200)]
Draw manager: Move UVs interpolation of child particles to a function

2 years agoDraw manager: De-duplicate calculation of parent UVs
Sergey Sharybin [Tue, 8 May 2018 12:06:00 +0000 (14:06 +0200)]
Draw manager: De-duplicate calculation of parent UVs

2 years agoDraw manager: Make parent and child particles code to be more equal
Sergey Sharybin [Tue, 8 May 2018 11:55:23 +0000 (13:55 +0200)]
Draw manager: Make parent and child particles code to be more equal

Make parent UVs calculation for simple children to match another block.

2 years agoDraw manager: More meaningful variable name
Sergey Sharybin [Tue, 8 May 2018 10:40:07 +0000 (12:40 +0200)]
Draw manager: More meaningful variable name

2 years agoDraw manager: Reduce indentation level in particle batch populate
Sergey Sharybin [Tue, 8 May 2018 10:36:20 +0000 (12:36 +0200)]
Draw manager: Reduce indentation level in particle batch populate

2 years agoMulti-Object-Editing : Support for MESH_OT_rip_edge by Miguel Pozo
Dalai Felinto [Wed, 9 May 2018 08:27:35 +0000 (10:27 +0200)]
Multi-Object-Editing : Support for MESH_OT_rip_edge by Miguel Pozo

Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3268

2 years agoModifier stack: remove last usage of DM in WeightVGProximity .
Bastien Montagne [Wed, 9 May 2018 08:10:30 +0000 (10:10 +0200)]
Modifier stack: remove last usage of DM in WeightVGProximity .

2 years agoMulti-Object-Editing: select_non_manifold by Jefferson Rausseo
Dalai Felinto [Wed, 9 May 2018 07:59:26 +0000 (09:59 +0200)]
Multi-Object-Editing: select_non_manifold by Jefferson Rausseo

Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3232

2 years agoMerge branch 'master' into blender2.8
Campbell Barton [Wed, 9 May 2018 08:02:33 +0000 (10:02 +0200)]
Merge branch 'master' into blender2.8

2 years agoMSVC: remove hack for near/far name collision
Campbell Barton [Wed, 9 May 2018 08:00:55 +0000 (10:00 +0200)]
MSVC: remove hack for near/far name collision

windows headers define these, conflicting w/ View3D.near/far.

2 years agoColor: Combine/Separate YCbCrA node default to rec. 709
Aaron Carlisle [Wed, 9 May 2018 02:24:58 +0000 (22:24 -0400)]
Color: Combine/Separate YCbCrA node default to rec. 709

This commit is part of T54798

Differential Revision: https://developer.blender.org/D3183

2 years agoBKE: bvhutils: Always return NULL when the BVHtree has no leafs.
Germano [Tue, 8 May 2018 23:31:26 +0000 (20:31 -0300)]
BKE: bvhutils: Always return NULL when the BVHtree has no leafs.

BLI_bvhkdop functions were not made to work with zero-leaf trees.
Perhaps a better solution would be to modify BLI_bvhkdop to work with zero leaf trees.
But this solution of returning NULL was already used for bvhtrees of looptris.

2 years agoED_transform: Port ED_transform_snap_object to new Mesh-based system.
Germano [Tue, 8 May 2018 23:04:32 +0000 (20:04 -0300)]
ED_transform: Port ED_transform_snap_object to new Mesh-based system.

Differential Revision: https://developer.blender.org/D2896

2 years agoBKE: bvhutils: Port bvhtree_from_mesh_get to take a Mesh param instead of a DerivedMesh.
Germano [Tue, 8 May 2018 23:00:51 +0000 (20:00 -0300)]
BKE: bvhutils: Port bvhtree_from_mesh_get to take a Mesh param instead of a DerivedMesh.

Differential Revision: https://developer.blender.org/D3227

2 years agoExtrude Widget: with/without axis constraint
Campbell Barton [Tue, 8 May 2018 18:28:40 +0000 (20:28 +0200)]
Extrude Widget: with/without axis constraint

2 years agoExtrude Widget: tweak draw style
Campbell Barton [Tue, 8 May 2018 18:14:50 +0000 (20:14 +0200)]
Extrude Widget: tweak draw style

Use filled circle for redo

2 years agoCleanup: naming (prefer len over num for new code)
Campbell Barton [Tue, 8 May 2018 17:36:02 +0000 (19:36 +0200)]
Cleanup: naming (prefer len over num for new code)

2 years agoCleanup: mesh_runtime naming
Campbell Barton [Tue, 8 May 2018 17:26:36 +0000 (19:26 +0200)]
Cleanup: mesh_runtime naming

- BKE_mesh_get_looptri_num        -> BKE_mesh_runtime_looptri_len
- BKE_mesh_runtime_recalc_looptri -> BKE_mesh_runtime_looptri_recalc
- BKE_mesh_get_looptri_array      -> BKE_mesh_runtime_looptri_ensure

2 years agoMissed last commit
Campbell Barton [Tue, 8 May 2018 17:16:33 +0000 (19:16 +0200)]
Missed last commit

2 years agoMerge branch 'master' into blender2.8
Campbell Barton [Tue, 8 May 2018 17:09:35 +0000 (19:09 +0200)]
Merge branch 'master' into blender2.8

2 years agoModifier stack: partial port of ShrinkWrap to new Mesh-based system.
Bastien Montagne [Tue, 8 May 2018 17:04:12 +0000 (19:04 +0200)]
Modifier stack: partial port of ShrinkWrap to new Mesh-based system.

Partial only, complete depends on BVHTree helper updates, and subsurf
updates.

2 years agoModifier stack: Port Warp to new Mesh-based system.
Bastien Montagne [Tue, 8 May 2018 16:41:43 +0000 (18:41 +0200)]
Modifier stack: Port Warp to new Mesh-based system.

2 years agoModifier stack: port Mask to new Mesh-based system.
Bastien Montagne [Tue, 8 May 2018 16:19:28 +0000 (18:19 +0200)]
Modifier stack: port Mask to new Mesh-based system.

2 years agoCleanup: includes
Campbell Barton [Tue, 8 May 2018 16:01:47 +0000 (18:01 +0200)]
Cleanup: includes

2 years agoCleanup: move mesh conversion into own function
Campbell Barton [Tue, 8 May 2018 15:44:54 +0000 (17:44 +0200)]
Cleanup: move mesh conversion into own function

2 years agoModifier stack: Port Caqst to new Mesh-based system.
Bastien Montagne [Tue, 8 May 2018 15:52:24 +0000 (17:52 +0200)]
Modifier stack: Port Caqst to new Mesh-based system.

2 years agoCollections: remove per collection and view layer engine overrides.
Brecht Van Lommel [Tue, 8 May 2018 13:57:20 +0000 (15:57 +0200)]
Collections: remove per collection and view layer engine overrides.

This will be handled by the new view layer override system which will
store data elsewhere, removing the code already for easier refactoring.

2 years agoCleanup: consistent BKE_mesh naming
Campbell Barton [Tue, 8 May 2018 15:28:43 +0000 (17:28 +0200)]
Cleanup: consistent BKE_mesh naming

2 years agoCleanup: use bool for BKE_mesh_new_from_object
Campbell Barton [Tue, 8 May 2018 15:17:40 +0000 (17:17 +0200)]
Cleanup: use bool for BKE_mesh_new_from_object

2 years agoCleanup: rename variables
Campbell Barton [Tue, 8 May 2018 15:15:23 +0000 (17:15 +0200)]
Cleanup: rename variables

DerivedMesh had some odd conventions, remove from BKE_mesh.

2 years agoCleanup: use 'nomain' when not in library data
Campbell Barton [Tue, 8 May 2018 15:06:30 +0000 (17:06 +0200)]
Cleanup: use 'nomain' when not in library data

Rename only.

2 years agoCleanup: whitespace, duplicate includes
Campbell Barton [Tue, 8 May 2018 14:57:07 +0000 (16:57 +0200)]
Cleanup: whitespace, duplicate includes

2 years agoModifier stack: Port Smooth to new Mesh-based system.
Bastien Montagne [Tue, 8 May 2018 14:42:01 +0000 (16:42 +0200)]
Modifier stack: Port Smooth to new Mesh-based system.

2 years agoMerge branch 'master' into blender2.8
Bastien Montagne [Tue, 8 May 2018 14:06:32 +0000 (16:06 +0200)]
Merge branch 'master' into blender2.8

Conflicts:
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_uvproject.c