Blender Git Commit Log

Mesh Batch Cache: Fix threading issue

I believed the crash I experienced happened because:
1. The `extract_pos_nor_init` function is called.
2. Tasks are added to the task pool for `extract_pos_nor`.
3. The tasks begin to be executed while more tasks are added.
4. In some rare cases, all existing tasks are finished, but not all have been added yet.
5. This let the task-counter go down to zero.
6. This triggered a call to `extract_pos_nor_finish`.
7. Then more tasks are added and in the end `extract_pos_nor_finish` is called again.

A solution is to use a task pool that is suspended when created.
Unfortunately, there was an outdated comment, that was probably the root cause of the issue.

Reviewers: fclem, sergey

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

Merge branch 'master' into asset-engine

Merge branch 'feature/modifier_openvdb_280' into blender-v2.80-develop

MovieClip: Make name of Active Clip consistent in UI

Using the currently active movie clip had different names in the interface:
In scene context it was "Active Movie Clip", in Camera Background Images it was "Camera Clip", in Constraints it was "ActiveClip".
I made all those instances use "Active Clip", which is descriptive enough and also the shortest of the three.

Reviewed By: billreynish

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

Merge branch 'master' into asset-engine

LANPR: Move object LANPR tab under material tab.

Merge remote-tracking branch 'origin/master' into temp-lanpr-staging

File Browser: Add Zip files as native recognised file type

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

Reviewers: Brecht

LANPR: Use private header in editor module.

Merge remote-tracking branch 'origin/master' into temp-lanpr-staging

Cleanup: use backslash for doxygen commands

Cleanup: clang-format

Fix 'make icons' on Linux

CRLF line ending caused shebang to fail.

Rename 'transform_..._actiondata.c' to 'transform_..._action.c'

Transform: Rearrange `transform_conversions` header

Transform: Move node conversion to its own file

Transform: Move Texture Space conversion to its transform_conversion_object

Transform: Move Object conversion to its own file

Shading: Rewrite Mapping node with dynamic inputs.

This patch rewrites the Mapping node to support dynamic inputs. The
Max and Min options have been removed. They can be added as Min and
Max Vector Math nodes manually.

Texture nodes still use the old matrix-based mapping. A new SVM node
`NODE_TEXTURE_MAPPING` has been added to preserve this functionality.
Similarly, in GLSL, a `mapping_mat4` function has been added.

Reviewers: brecht, JacquesLucke

Merge branch 'master' into asset-engine

Partial merge only, UI in filebrowser has been heavily changed and need
more work...

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/intern/wm_operator_props.c