Blender Git Commit Log

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-voxel

# Conflicts:
# source/blender/blenkernel/BKE_node.h

- reverted unneeded change

Merge remote-tracking branch 'origin/soc-2021-porting-modifiers-to-nodes-remesh-blocks' into soc-2021-porting-modifiers-to-nodes-remesh-blocks

# Conflicts:
# source/blender/nodes/geometry/nodes/node_geo_remesh_blocks.cc

- changes based on Review by Jacques Lucke (JacquesLucke)

- changes based on Review by Jacques Lucke (JacquesLucke)

Compositor: Full frame input nodes

Adds full frame implementation to "Bokeh Image" node, "Track Position"
node and `SetVectorOperation`.
The other nodes in "Input" submenu are implemented separately.
No functional changes.

---
Note:
These nodes are very similar to already reviewed nodes. The patch
is meant for a quick look before committing.

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

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-blocks

Cleanup: Simplify logic, follow style guide for integer types

- Use `int` instead of `unsigned int` for mesh indices
- Use C++ types (Array, float3, IndexRange)
- Use range based for loops

- reverted unrelated changes

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate

# Conflicts:
# source/blender/blenkernel/BKE_node.h
# source/blender/blenloader/intern/versioning_defaults.c
# source/blender/editors/asset/intern/asset_filter.cc
# source/blender/editors/interface/interface.c
# source/blender/editors/interface/view2d_draw.c
# source/blender/freestyle/intern/winged_edge/Curvature.cpp
# source/blender/makesdna/DNA_fluid_types.h
# source/blender/python/intern/bpy_props.c
# source/blender/windowmanager/WM_types.h
# source/blender/windowmanager/intern/wm_dragdrop.c

- changes based on Review by Jacques Lucke (JacquesLucke) and feedback by Miro Horv�th (dreamak).

Fix build error in debug builds and uninitialized structs

This BMesh iterator hadn't been used in C++ code yet, and needed
a macro for a proper cast. The parameter structs need to be initialized
when declared without designated initializers.

Compositor: Fix wrong number of threads during constant folding

The variable was uninitialized at that point of execution.

Cleanup: unneeded default constructor definitions

Compositor: Buffer iterators tests

See D11882 for a description of the iterators.

Reviewed By: jbakker

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

Assets: Rename "Mark Asset" operator to "Mark as Asset"

This naming change was agreed on during the asset workshop. See
https://code.blender.org/2021/06/asset-browser-workshop-outcomes/#terms-definitions.

UI: Move Mark/Clear asset out of ID Data in Outliner context menu

They are now always shown in the top-level of the Outliner context menu.
Having them in the ID Data submenu was just a hassle to work with, and
often confusing to users - even if technically correct (the asset status
is part of the ID data).

Part of T82680.

Cleanup: Move remesh files to C++

This will be helpful for some cleanups I'd like to do, including
removing the unecessary C API for OpenVDB and unifying some
attribute transfer code.

Fix incorrect poll function used for file path dropping

The operator to drop file paths into the File Browser was just checking
if there's an active window. This wasn't really an issue since the
operator was only used as drop-operator for the File Browser. But the
operator would show up in the operator search. Plus, for asset browsing,
we'll also have to check the file browsing mode, so the more specific
poll function will be needed.

Assets: Disable File Browser only operators for asset browsing

These operators shouldn't be available in the Asset Browser.

https://developer.blender.org/T83556

Added a comment to each operator poll assignment to explicitly mention
the intention. That should also remind devs to decide if the operator
should apply for both file & asset browsing when copy & pasting operator
definition code.