Blender Git Commit Log

Merge branch 'master' into soc-2019-openxr

Remove compiler fix for unsupported MSVC version

Outliner Merged object search: Simplify memory free callback

Rather than use custom callback, use MEM_freeN

Fix not reported: Face selection sometimes does not work in weight, paint and texture mode.

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/gpencil_modifier.c
source/blender/editors/gpencil/annotate_paint.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/object/object_hook.c
source/blender/editors/space_clip/clip_graph_draw.c

Profile Widget: Complete rename of public functions

Profile Widget: Add BKE prefix to public functions

Bevel modifer: Add isDisabled function

When the width of the bevel is zero the modifier doesn't do anything
so it should be disabled.

Bevel modifier: Display optimization

Only reinitialize the sampled segments table for the display profile
widget when the number of samples has changed.

Profile Widget: Sampling function returns ProfilePoint array

This enables two things:
- Memory savings, because no temporary array is needed to change data
formats anymore and because the results can be reused more easily
- Also returning information about which sampled points came from control
points with vector handles, which will be useful for hardening normals of
custom profile bevels.

GPencil: Revert wrong merge of LANPR branch

Due to an error, the code of LANPR branch was merged accidentally to the Grease Pencil branch.

This commit reverts all work to the last correct commit.

The command executed was: `git diff ff7482286319e7b462b98dc26909b47d9d661ec6 | patch -p1 -R`

Thanks to @dfelinto for fixing the error.

Cleanup: use BKE_ prefix for BKE_colortools.h

Cleanup: clang-format

Fix Dopesheet transform regressions due to rB81dc76c19cff

Functions that begin with the name `apply` closely resemble the main callback to apply.
Ref T68137

Annotations: Remove Simplify option from Userprefs

This option was an old option for Grease Pencil tools and it's not logic for Annotations.

Differential Revision: https://developer.blender.org/D5426

Preserve existing dirty flags when flagging outliners

Fix T68320: measure tool memoryleak

It was a stupid mistake with the wrong pointer being referenced.
It was a serious problem because the memory leak was considerable.

cleanup llvm function type creation

Avoid getting scene & view layer for each call to outliner_sync_selection_from_outliner

Rename vars