Blender Git Loki

solve merge conflicts

UI: avoid using parenthesis

Convention is not to use parenthesis,
Details are included in tool-tip.

Merge branch 'master' into functions

BLI: fix unregistering timer with same id twice

BLI: new C++ ArrayRef, Vector, Stack, ... data structures

Many generic C++ data structures have been developed in the
functions branch. This commit merges a first chunk of them into
master. The following new data structures are included:

Array: Owns a memory buffer with a fixed size. It is different
from std::array in that the size is not part of the type.

ArrayRef: References an array owned by someone else. All elements
in the referenced array are considered to be const. This should
be the preferred parameter type for functions that take arrays
as input.

MutableArrayRef: References an array owned by someone else. The
elements in the referenced array can be changed.

IndexRange: Specifies a continuous range of integers with a start
and end index.

IntrusiveListBaseWrapper: A utility class that allows iterating
over ListBase instances where the prev and next pointer are
stored in the objects directly.

Stack: A stack implemented on top of a vector.

Vector: An array that can grow dynamically.

Allocators: Three allocator types are included that can be used
by the container types to support different use cases.

The Stack and Vector support small object optimization. So when
the amount of elements in them is below a certain threshold, no
memory allocation is performed.

Additionally, most methods have unit tests.

I'm merging this without normal code review, after I checked the
code roughly with Sergey, and after we talked about it with Brecht.

Cycles: Fix Show Instanced Local View Objects

The local view check in the RNA didn't support instanced objects. Every
object has a copy of the local_view_bits from the base. This patch
changes the check to look at the local stored bits.

This patch removes the check if the object is part of the view_layer.
In the cases we are using it this check is not relevant. The `mesh_tissue`
add-on also uses it, and is not effected by this change.

Reviewed By: brecht

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

Shading: Add More Features To The Voronoi Node.

This patch allows the Voronoi node to operate in 1D, 2D, and 4D space.
It also adds a Randomness input to control the randomness of the texture.
Additionally, it adds three new modes of operation:

- Smooth F1: A smooth version of F1 Voronoi with no discontinuities.
- Distance To Edge: Returns the distance to the edges of the cells.
- N-Sphere Radius: Returns the radius of the n-sphere inscribed in
the cells. In other words, it is half the distance between the
closest feature point and the feature point closest to it.

And it removes the following three modes of operation:

- F3.
- F4.
- Cracks.

The Distance metric is now called Euclidean, and it computes the actual
euclidean distance as opposed to the old method of computing the squared
euclidean distance.

This breaks backward compatibility in many ways, including the base case.

Reviewers: brecht, JacquesLucke

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

Merge branch 'master' into greasepencil-object

add license header to memory utils

rename BLI_memory.h to BLI_memory_utils_cxx.h

change .cpp to .cc in blenlib

change .hpp to .h in blenlib

Fix T69789: Assert when create a new Full Copy scene base on 2D template.

Private ID data (nodetrees and scene collections...) need special care
and handling of their copy flags, and checks must be adapted too.

In that case, issue came from the fact that even though those IDs have
to be copied outside of bmain, we may still require usercount handling.

That commit also fixes a somewhat related issue - we cannot use the
non-id private data copying flag for private IDs copying, due to
difference in handling of usercount again.

UI: Sub-type for Screen Grab Size.

Set to Pixel.

UI: Wrong label in Screen Grab Size.

It was using "screen_grab_size" as label.

UI: Labels capitalization.

Capitalize the first letter of a word, except articles and prepositions.

change .hpp to .h

reflow comment

Fix T69785: crash dragging in empty space in edit mode

Cleanup: compiler warnings