Blender Git Loki

Merge branch 'blender2.7'

Fix GPU linking Error.

"The geometry shader uses varying _I;gl_PerVertex;gl_ClipDistance, but previous shader does not write to it."

Cycles: change default displacement method to bump mapping again.

Even though it makes sense logically to have displacement actually displace
the mesh, this is causing a lot of confusion for existing users that are used
to the previous behavior. Further, since Eevee does not support displacement
yet and the discrepancy between the viewport and final render is problematic.

Fix T60133: texture paint external editing not working

Operator relys on 3DView and was failing from Topbar and Properties
Editor. Now tries to find the biggest 3DView and uses that.

Reviewers: brecht

Maniphest Tasks: T60133

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

Animation player: tweaks for zooming in and out

Use zoom steps lower than 1. This allows to zoom out a high-res
image. For example, before it was not possible to maker 4K image
to fit on FullHD monitor.

Also, don't force zoom to be above 1. Not sure why that was done,
but this disallows zooming out.

It is still not possible to zoom in higher than the window size
allows. In order to support this the player needs to be refactored
in a way that allows to decouple zoom from window size.

Fixes T59177: Animplayer extreme zooms in when playing rendered animation

Fix T59972: UV live unwrap does not pack islands.

Packing was not being called after multi-object editing changes. Includes code
refactoring to make function parameters more clear.

Fix T59933: timeline keyframe display not updating when selecting objects.

Fix T58502: scopes don't work in the image editor

There were two problems:
1. The scopes were only updated when the "Scopes" category is active,
but this category has been removed in Blender 2.8.
2. The scopes moved from the TOOLS to the UI region.
However the update-code still searched for the "Scopes" category
in the TOOLS region.

Both problems are fixed with this commit:
1. Scopes have there own category again.
2. The update code is in the correct draw function now.

Reviewers: brecht

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

Fix T60810: crash editing mesh with subdivision modifier

typo in rBdc7e49298940

Reviewers: fclem

Maniphest Tasks: T60810

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

Fix T60795: Crash when joining objects with shape keys.

Stupid mistake really, cannot use NO_MAIN here, temp shapekey is in
Main. Using/fully supporting out-of-main temp IDs is still a bit WIP...

Multires reshape: correct grids level allocation

Similar to masking grids, need to also check existing grid level.

This is because edit mode might leave allocated grid with 0 levels.

Fix T59145: don't clamp color value in Hue Saturation Value node in eevee

Fix T59423: Mesh deform modifier bind bug causing spiky deformations.

Same as rBac316a6526c7.
(I should have commited in 2.7 first and then merged in 2.8).

Fix T60807: Can't select when active pose object is hidden

Object mode locking wasn't accounting for the 3D view context
which doesn't have an active object once its hidden.

Cleanup: use braces for single line if statements

Cleanup: Replace BASACT use w/ a variable

Cleanup: remove make wrapper

Intended for silent build output,
ninja build system can do this now.

Fix T59423: Mesh deform modifier bind bug causing spiky deformations.

The intersection was being tested between ray and tri, the correct one is segment and tri.

Cleanup: removed unused 3D view header template.

Fix T58216: backdrop drawing in sequencer broken.