Blender Git Loki

GP EditMode: Simplify the way that this is handled

Now, instead of actually altering the ob->mode flag, we just make the
object mode setter operator (and the header) delegate to the appropriate
GPencil things to do their thing if they wish first.

As a result, we don't have to worry about version patching or issues with
changing selected/active objects.

Added globals as a distinct argument to the eval function.

Revert "Another compile fix for the experimental Cycles build"

This reverts commit 489b85302959da2525058e37c7e49e4cc34226a6.

Another compile fix for the experimental Cycles build
Sorry for the noise, it built fine on my system.

Squashed commit of the following:

commit 606fc4d6ee1f403b22320ef6f2baef58600ba410
Author: Lukas Stockner <lukas.stockner@freenet.de>
Date: Thu Oct 22 16:47:03 2015 +0200

Experimental build with some rather unstable Cycles changes

windows compile fix

Revert "Squashed commit of the following:"

This reverts commit 89dedc4a4b282ab83dfe8cb8589a966751da914d.

crash fix in propagateDamage, checking for index being smaller than connection size now

Squashed commit of the following:

commit 11b676653b2047187c5e6bdf554708ca13fe0e84
Author: Lukas Stockner <lukas.stockner@freenet.de>
Date: Thu Oct 22 16:47:03 2015 +0200

Experimental build with some rather unstable Cycles changes

Plus some fixes for compiling correctly

Merge branch 'wiggly-widgets' into UI-experiments

Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform_manipulator.c

Merge branch 'master' into UI-experiments

Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/customdata.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform_manipulator.c
source/blender/windowmanager/intern/wm_init_exit.c

Revert "Squashed commit of the following:"

This reverts commit 22ea3a538462f291f39ac7eb8aa8bf27f213cc29.

Squashed commit of the following:

commit d54706d003b67f4d087eedc0c0ca8483f275f823
Author: Lukas Stockner <lukas.stockner@freenet.de>
Date: Thu Oct 22 16:47:03 2015 +0200

Experimental build with some rather unstable Cycles changes

Merge remote-tracking branch 'origin/master' into experimental-build

Merge branch 'master' into ui-align-rework

Fix (hack around :| ) the one-pixel issue with stiched but not aligned to LEFT/TOP buttons.

Support for constants as internal node socket inputs.

Constants should never be linked to other nodes (will be ignored).

Added an integer type for node sockets.

Merge branch 'master' into GPencil_Editing_Stage3

GP EditMode: Some more fixes for editmode handling to resolve some annoying corner cases

* Edit Strokes mode should only be available if there is actually a GP datablock
and it is in editmode
* If exiting strokes editmode with the active object hidden, the flag would not get
cleared, and it would appear that we were still in editmode.

speed enhancement for building compounds (omitting broadphase handles) and successful test with clusters, values need a bit tweaking but basic principle works