Blender Git Commit Log

Add custom override_apply func for animdata.

This makes creating animation in overridden ID working, at least in the
most basic case...

Merge branch 'blender2.8' into topbar

Merge branch 'blender2.8' into greasepencil-object

WIP: Create SceneLayer if missing

Merge branch 'master' into blender2.8

BLI_utildefines: sync w/ 2.8

Cleanup: use 'uint'

Cycles: Fix after recent merge from master

random_id() crashes when there is no current dupli object.

We could also throw a Python error when doing it via RNA, but as far as
Cycles is concerned we need to check if instanced.

GSet: utils to access data stored outside the set

Merge branch 'id_override_static' into asset-engine

Merge branch 'blender2.8' into id_override_static

Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/blenlib/intern/rand.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/makesrna/intern/rna_mask.c

Merge commit '212a8d9e5ae7' into blender2.8

Considerable non-trivial merge conflict fixes.

Merge commit '212a8d9e5ae7^' into blender2.8

Change texture format

Due draw manager changes, the texture must be DRW_TEX_DEPTH_24_STENCIL_8 instead of DRW_TEX_DEPTH_24

Rename "Hair" modifier to "Fur" modifier.

This will be a simple testbed for generating hair geometry.

The plan here is to use different modifiers for different editing methods
for hair. Each of these will use a HairSystem instance, but vary
in the editable data used to generate guide curves. The hair system
underneath is agnostic to the editing method used.

Merge branch 'blender2.8' into greasepencil-object

Fix T53309: Remove default 'Clear loc/rot/scale delta transform' shortcuts.

The loc one (shift-alt-G) was same as 'remove selected from active group'
action... Clear delta transform is not a common operation, so we can
live without a default shortcut for it.

Note that using same key (G) in same space for two completely different
kind of operations is probably a rather bad thing, nice topic for future
keymap work. ;)

Probably nice to have in 2.79a.

Merge branch 'id_override_static' into asset-engine

Heavy refactor of new RNA override/comparison code.

Main reason here is to make comparison/override_diff/override_store/override_apply
customizable per RNA property if needed.

This should allow us especially to get advanced behavior on case-by-case
basis, when dealing with Pointer and Collection properties mostly.

Note that IDProps remain fuzzy area for now, a big part of the code
tries to take them into account, but it's most likely still missing some
bits, and definitively not tested at all yet!