Blender Git Commit Log

Depsgraph: Prevent non-expandable datablocks from being freed

This avoids original image datablock destruction when using
copy on write.

Fix Users count

The value must be 2, not 3.

MSVC: Fix lite build.

MSVC still defines __cplusplus as 199711L until it's in full conformance with the newer c++ standards, however the things we need from the standard are fully supported, hence a check for the msvc version was needed.

DRW: Fix bound_ubo_slots allocation size.

DRW: Fix ubo binding code.

Fixed: cache clearing when using multiple Alembic files.

Fix problem to enter in edit mode with Tab key

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

# Conflicts:
# intern/cycles/bvh/bvh.cpp
# intern/cycles/device/device.cpp
# intern/cycles/device/device.h
# intern/cycles/device/device_cpu.cpp
# intern/cycles/kernel/geom/geom_object.h
# intern/cycles/render/mesh.cpp
# intern/cycles/render/scene.h

Fix BLI_assert for MSVC

Also use `_BLI_ASSERT` prefix for internal defines.

Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/library_query.c

Fix missing ID pointer handling in materials in ID remapping code.

Fix missing array duplication when copying material

Texture paint slots were copied as a pointer, causing double-free.

Cleanup: Move GP Object specific properties panels to properties_data_gpencil.py

Note:
* Layers and Onion Skinning panels haven't been moved yet.
This is so that we can reconsider what (if any) changes
need to be made to share common elements between GP Object
and annotation GP use cases.

Cleanup: unused variables

Missed in own recent changes.

Cleanup: Remove unused code

More Brush Appearance Panel tweaks

* Always show this panel. Previously, it wouldn't get shown for the Eraser,
meaning that if you accidentally changed a brush to an eraser, you couldn't
change it back

* Always allow changing the brush icon. Previously, this could only be done
for "Draw" brushes, but there isn't really any reason why this shouldn't
be allowed.

Brush Appearance Panel - Cleanup + Tweaks

* The "Draw" case was discarding the settings.brush value and redefining
its own brush variable. Reoranised code so that this doesn't need to
happen
* Reorganised order of properties - all brush type/icon related stuff
comes first now
* Remove extra/excess layout elements/lines

Don't collapse "Brush Appearance" panel

It's in a tab by itself already, so there's no need to make ti even harder
to access its settings.

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'master' into blender2.8