Blender Git Commits

Merge branch 'master' into greasepencil-object

GP: Remove temporarily chord primitive

As this primitive is not defined completely, we remove it now and we can add later. Keep this primitive in the source code can produce errors when move more stable options to master.

Merge branch 'master' into greasepencil-object

Own left-bottom aligned region for Save Preference button

* Own region allows scrolling the navigation bar independently (Save
Preference button stays visible).
* We may want to change background color and size, but I'll leave that
for others to do.
* Region can be hidden but not scaled or scrolled.
* Bumps subversion.
* Added new execute region type which we may want to use in more places.
* Had to do some tweaks to drawing/layout code to get the dynamically
sized region to work without glitches.
* Also correct navigation bar versioning code to use full area width for
header.

Merge branch 'master' into greasepencil-object

Merge branch 'master' into userpref_redesign

Merge branch 'master' into userpref_redesign

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/editors/gpencil/gpencil_intern.h
source/blender/editors/gpencil/gpencil_primitive.c

More tweaks to Preferences

* Brighter navigation bar background to avoid conflicts with subpanel backgrounds
* Group together device input settings into one panel (with sub-panels)
* Group together view manipulation settings into one panel (with sub-panels)
* Move Save Preferences button back to header until own region for it is ready

Merge branch 'master' into userpref_redesign

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

Merge branch 'master' into greasepencil-object

Merge remote-tracking branch 'origin/master' into fracture_modifier-2.8

# Conflicts:
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/blenkernel/BKE_rigidbody.h
# source/blender/blenkernel/intern/rigidbody.c
# source/blender/depsgraph/intern/builder/deg_builder_relations.cc
# source/blender/editors/physics/rigidbody_constraint.c
# source/blender/makesrna/intern/rna_rigidbody.c

Merge branch 'master' into greasepencil-object

Merge branch 'master' of git.blender.org:blender into cycles_texture_cache

GP: Primitive: Fix randomness bias

GP: Primitive: Fix merge errors

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into userpref_redesign

Use term "Preferences" instead of "User Preferences" in the UI