Blender Git Loki

formatting and comment clean up

Depsgraph: Fix wrong relation names

Depsgraph: Fix wrong relations in array modifier

Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

Conflicts:
intern/cycles/blender/blender_python.cpp
intern/cycles/device/device_opencl.cpp
intern/cycles/kernel/kernel_accumulate.h
intern/cycles/kernel/kernel_path.h
intern/cycles/kernel/kernel_path_branched.h
intern/cycles/kernel/kernel_path_surface.h
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/svm/svm_displace.h

Cycles: Add comments to endif directives

`kernel_path.h` and `kernel_path_branched.h` have a lot of conditional code and
it was kind of hard to tell what code belonged to which directive. Should be
easier to read now.

Cycles: Add lines that got removed by accident in recent merge

Use axes colors from custom-manipulators branch

Fix incorrect color of axes on "Reset to Default Theme"

Merge branch 'blender2.8' into custom-manipulators

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c

Don't draw helplines when using transform manipulators

Also removed unused transform flag.

Fix T49961: Blender 2.8 Crashes on saving an image

Caused by 4811b2d3565cf which caused the event handler hack that is used to fire up the file browser from other operators to fail. Basically the context from before the file browser is opened gets stored and used later for executing the actual file read/write operation (in this case, saving image). This context storage is cleared when exiting an editor since 4811b2d3565cf, which is technically correct, but causes usage of NULLed context data in this case, because the file browser is exited before the file read/write operation is executed.

For now I solved this by moving the fileselect handler to list of normal handlers, instead of modal ones. 4811b2d3565cf only touches list of modal handlers so we avoid the crash. Ideally we'd completely refactor how the file browser opening works to get rid of these event handler hacks.

Note that I wouldn't be suprised if this causes other regressions, but I couldn't find one so worth a try.

Consider Numpad Enter in pose slide operators

It was annoying to only have regular Enter confirming input there.

Fix `BKE_library_make_local()` trying to also make local proxified objects.

Proxified objects can never be local, we can totally ignore them here.

This 'fixes' the asserts related to usercount when trying to remap poselib
of localized proxified objects (not sure what exactly was going on wrong here,
but proxies are a giant can of worms for sane data-blocks handling anyway :/).

Depsgraph: Fix another issue which seems to be a bug

Similar to a previous commit.

Doing separately for an easy of bisect.

Depsgraph: Fix wrong relation from IK solver to pole target

Copy paste error...

How to avoid those?

Merge branch 'master' into cycles_split_kernel

Fix Grease Pencil render in VSE crashes when no strips (#T49975)

Solution as suggested by Sergey Sharybin. Initial debugging by
Antonio Vazquez.

Saving & loading via temporary file.

Also allowing for image & icon sizes to be different.

buidlbot, msbuild is slightly different in that is wants to build debug anyway even if we told cmake we want release

buidlbot, msbuild is slightly different in that is wants to build debug anyway even if we told cmake we want release