Blender Git Loki

PyAPI: point sys.executable to the Python binary

`sys.executable` is documented to be a Python interpreter or None.

This was set to Blender's executable which caused the multiprocessing
module to spawn new instances of Blender instead of Python on WIN32.
See issue described in D7815.

Deprecate 'bpy.app.binary_path_python' & warn when using.

Blender's executable remains accessible via `bpy.app.binary_path`.

UI: Move the 'Resolve Conflict' button closer to the text data-block

Moves the Text Editor 'Resolve Conflict' button closer to data-block selector and with 'Question' icon.

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

Reviewed by Hans Goudey

Cleanup: Update comment

This comment has to be updated since it was moved
from the header file to the source file.

Merge branch 'master' into geometry-nodes

Fix use after free in interface handler

ASAN reported a use after free in after rB15d78ea85b602c. This commit
removed a reassignment of the `data` variable here that was actually
required because it may have been freed earlier in the function. This
sort of error would be avoided if the same variable wasn't reused for
different purposes.

Geometry Nodes: Support pointcloud in transform node

This is likely not the final implementation of the transform node, but
it's a good trivial case for supporting multiple geometry data types.

GPencil: New parameter in Texture modifier to rotate Dot textures

This new parameter allows to rotate the texture of any Dot or Square stroke.

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

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-edit-curve

Merge branch 'blender-v2.91-release'

GPencil: Fix unreported Fill when use boundary and Visble layers

The new option to filter the layers used by the Fill tool was not using the boundary strokes. The problem was the layers were skipped and any boundary stroke was not used.

Now, the layer is not skipped, but the strokes that are not boundary are skipped.

Merge branch 'master' into xr-actions-D9124

XR: Add XR identifiers to key config I/O

Allows XR action properties to be shared with others.

Fix group input is resetting in modifier

Fix missing null check in recent commit

git blame: add file to help ignore cleanup commits

wiki.blender.org/wiki/Tools/Git#Tips has been updated.

A follow up to
lists.blender.org/pipermail/bf-committers/2020-October/050698.html
will be sent after commit.

Reviewed By: brecht, campbellbarton

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

Cleanup: Use proper C++ types

Fix T81854: crash when undoing switch between sculpt and edit mode.

The logic of `BKE_sculpt_update_object_for_edit` was not correct. such
low-level functions should typically never preform depsgraph evaluation
themselves, they should be able to rely on getting a fully evaluated
depsgraph and just get needed data from there.

Supporting that required fixing other broken code higher in the
callstack, namely:
* `ED_object_sculptmode_enter_ex` was freeing evaluated data, for no
valid reason it would seem.
* `sculpt_undosys_step_decode` was ensuring an evaluated depsgraph
**before** calling `ED_object_mode_generic_exit`, which would
invalidate a lot of evaluated data.

Note that it is fairly difficult to track down all code paths leading to
`BKE_sculpt_update_object_for_edit`, so there may be still cases where
this gets called with improperly evaluated depsgraph.

Reviewed By: sergey

Maniphest Tasks: T81854

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

Merge branch 'blender-v2.91-release'

Fix T81844: Change Bone Layers fails in Pose Mode

When selecting multiple layers, the redo operator might not correctly
update the pose data. To make sure it is in a good state we have to
ensure that the pose data is good.

Reviewed By: Bastien

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