Blender Git Commit Log

Fix bad merge conflict resolution

Line got lost..

Modifiers: Add wrapper functions with Mesh / DerivedMesh conversion

Makes the follow changes:

- Add new `deform*` and `apply*` function pointers to `ModifierTypeInfo` that take `Mesh`, and rename the old functions to indicate that they take `DerivedMesh`. These new functions are currently set to `NULL` for all modifiers.
- Add wrapper `modifier_deform*` and `modifier_apply*` functions in two variants: one that works with `Mesh` and the other which works with `DerivedMesh` that is named with `*_DM_depercated`. These functions check which type of data the modifier supports and converts if necessary
- Update the rest of Blender to be aware and make use of these new functions

The goal of these changes is to make it possible to port to using `Mesh` incrementally without ever needing to enter into a state where modifiers don't work. After everything has been ported over the old functions and wrappers could be removed.

Reviewers: campbellbarton, sergey, mont29

Subscribers: sybren

Tags: #bf_blender_2.8

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

Fix missing initialization of depsgraph for snapping context

Was causing crashes once attempting to use snapping.

Reported by mano-wii in IRC, thanks!

Workbench: use SET_UINT_IN_POINTER for hashes

Merge branch 'blender2.8' into blender2.8-workbench

Workbench: fixed C++ style comments

Cleanup: Indentation

Added comment to explain MeshRenderData.orco

Merge branch 'master' into blender2.8

Depsgraph: Fix missinf relation for particle instance modifier

Was causing lack of animation update when particle system had simulation,

Merge branch 'blender2.8' into blender2.8-workbench

Workbench: reuse similar materials

Similar materials will reuse the same shadergroup. Currently using
a custom hash function that might select too similar colors into the
same material.

Reintroduced the workbench_materials.c this file will be responsible for
material lookup/creation and shader compilation

Fixed a GPUShader mem leak

Cleanup: Trailing whitespace

Merge remote-tracking branch 'origin/master' into blender2.8

Explicitly undoing 287d1924fa149f0 here, as that was a master-only change.

Remove irrelevant print statement

This statement is only relevant in 2.8, but causes confusion in master.
I kept the 'default' label to prevent compiler warnings about unhandled
cases. The break is needed because there should be at least one statement
after 'default'.

Merge branch 'blender2.8' of git.blender.org:blender into blender2.8

WORKBENCH: Solve C2016 compile errors

Disable auto-override for all but active object in group case.

I.E. only enable auto-override for 'active' selected object when making
an override of a linked group. This will ease on auto-override creation,
and you typically do not want to auto-override most objects in the group
anyway (in proxy system, you could only proxyfy one object of the group
anyaway!).

Object Mode: Outlines: Make outline thinner.

This is by default. We can still enable the thicker outlines for high dpi
screens or personnal preference but it's not used atm. This also improve
the performance removing 1/3 of the outline cost.

Object Mode: Outlines: Fix sample coordinates.