Blender Git Loki

UI: show frame rate in movie clip editor

Feature Request from Hjialti.

Attempt to sanitize node tree deletion

Make it explicit when freeing node tree which is owned by other
ID or when freeing node tree which is outside of a bmain.

Fix T59220: Deleting object causes blender 2.8 to crash

The issue was caused by a special code in node tree freeing function
which will free extra fields in the case when tree is not in bmain.
This is how old code was dealing with "nested" trees, but is now
making behavior different from other datablocks. This is exactly
what was confusing copy-on-write logic.

Ideally, ntreeFreeTree() need to behave same as all other datablocks,
ad freeing of data of nested trees should be up to the owner of the
tree (this way it's all explicit and does not depend on check of
some special flag.

Merge branch 'master' into blender2.8

CMake: Fixes for OpenGL library preferences

Prefer legacy OpenGL library, for the compatibility and portability
reasons.

Also use proper OpenGL libraries to be linked against, so we can
change preference to GLVND.

Fix T59365: Blender crashes when I try to open a .blend file.

Broken logic in check for a valid vgroup storage pointer...

temp: add brushes for hair editing.

fix relationship line always drawing from the parents origin

this can be different though (e.g. vertex parenting) and correct location
is already stored in ob->orig

spotted while looking into T59332

Reviewers: fclem, brecht

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

Fix T58351: Make Single User crashes

New object API function : BKE_object_eval_reset()

This restores the object->data to a non-modifier evaluated state.

So this allow us to change evaluated object modifier stack directly and
get BKE_mesh_new_from_object() for the evalauted object.

Build fixup for previous commit

Build error introduced on: 285cfef695e18a63eba81a385f9fd82bcbccdabc.

Fix T58652: Crash editing shape keys weirdness with instances

Fixing crash with cycles baking with is_cage and no cage

GP: Cleanup code and comments

Merge branch 'blender2.8' into greasepencil-object

Fix smooth contour modifier for API changes

Merge remote-tracking branch 'origin/blender2.8' into soc-2018-npr

# Conflicts:
# source/blender/makesrna/intern/rna_scene.c

Fix accidental merge error

Transform: remove incorrect 3D view check

UI: tweak text editing fields for higher contrast

By default the text button background color was a similar brightness
to the cursor, making it hard to see at times.

Button types number/slider/text background brightness when editing
varied quite a lot too.

- Change the background while editing to match the number button.
- Darken the selection for greater contrast.

Resolves T59219