Blender Git Commits

Fix merge error

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/addons
release/scripts/addons_contrib
source/blender/blenloader/intern/versioning_280.c

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/properties_material.py
release/scripts/startup/bl_ui/space_dopesheet.py
source/blender/draw/modes/draw_mode_engines.h
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_time/space_time.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw_legacy.c

Make sure hair follicle binding is updated before using invalid indices in drawing.

Merge branch 'blender2.8' into hair_guides

Fix unintentional changes from merge conflicts

Merge branch 'blender2.8' into topbar

Move data of global areas into a separate struct

Made the struct accessible via a pointer in the ScrArea so that we can
use a simple NULL-check for this pointer to see if the area is global.

The struct is not written to files, meaning we have the freedom to do
changes to it without having to worry about compatibility.

Fix hint for makesdna to not write top-bar struct commented out

Just did this for testing, but should not have ended up in the commit.

Support hiding the lower sub-bar by dragging the area edge up

Bring back unintentionally removed error print

Topbar: disable redo properties in topbar entirely for now, behind #ifdef.

This is going to be different with the tool / command separation plans, so
let's not confuse users for now.

Fix error from one of the merges, this line should have been removed.

Fix Tint and Hue/Saturation modifiers

Now the modifiers don't use the palettecolor pointer

Merge remote-tracking branch 'origin/blender2.8' into temp-modifier-rm-cddm

remove debug prints and stuff

Refactor Collada: Make BCAnimation class more self contained

Follwing funtionality was previously located in
BCAnimationSampler, but makes not much sense there:

* Moved the creation of the reference object into the Class constructor
* Moved the destruction of the reference to the Destructor

Furthermore:

* added get_reference() to better shield the rerference object from
unintentional access
* BCAnimationObjectMap now contains Pointers to BCAnimation objects
instead of containing full object instances. This avoids unnecessary
copying of the Animation datastructures when adding BCAnimation objects
to the BCAnimationObjectMap. Note: This forces us to delete the BCAnimation
objects in the BCAnimationSampler destructor.

Refactor Collada: Removed obsolete BCKeyPoint class

Also simplified the way how the AnimationSampler
stores its sampled data.

After some experimenting i decided to use FCurves as
intermediate storage for exported animation curves.
This looks a lot cleaner to me now because now i no
longer have duplicate storage locations.
Also the handling of curve handles is now pretty much straight
forward and no longer needs any extra calculations.

Tweaks to topbar versioning code

* Don't write global area pointers at all, leaves .blends a little
cleaner without broken pointers.
* Don't call editors functions from blenloader.
* Fix black topbar when loading some existing 2.8 saved .blends.