Blender Git Loki

Accidentally deleted a return statement in previous commit.

Fixed minor memory leak when the bake operator exits early without
freeing allocated data.

Optional filter group pointer in Cache Library for limiting cache
content.

This group is only used for the baking operator (like the datatypes
filter), but has no effect when reading caches. The UI now uses a box
layout to reflect this.

refactor remapping into mesh/curve API calls

use range function

Merge branch 'master' into temp-material-remap

Text mat_nr index starts at 1.

use macro /w error checks for remapping

add support for non-editmode text

also correct remapping range check

Material slot reorder https://developer.blender.org/T43235 (WIP)

This Diff implements the Material Slot reorder.
This Diff is a WIP and it probably needs a lot of rework, however i'd like to get some feedback
before i continue on it.

Note: I started with Severin's initial patch P193
There i added support for Materials assigned to Objects and materials assigned to Data
Then finally i added the material assignment swapping for Mesh, Nurbs and Fonts.

I tested the Diff for Mesh objects and there it seems to work nicely.
So for Mesh objects now changing the material order will preserve the material assignments.

Any feedback appreciated.
thanks

Reviewers: Severin, campbellbarton

Subscribers: campbellbarton

Maniphest Tasks: T43235

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

check extensions before use in GPUx

Using VAOs and integer vertex attributes.

VBO support is *not* checked because it�??s guaranteed to be there in a
GL 2.1 context.

VAOs are not part of GL 2.1, but enjoy nearly universal support.

gpu_shader4 is widely supported on recent hardware, not always on older
HW.

add runtime check for gpu_shader4 support

This extension includes a number of GLSL enhancements:
- full integer support
- interpolation qualifiers (flat, smooth, noperspective)
- gl_VertexID, gl_PrimitiveID
- custom fragment shader outputs, for MRT

Removed unused function for constructing a list of objects used by a
cache library.

This was no longer how cache libraries are used anyway, they now cache
based on duplilists, which can be more than recursive groups.

Merge branch 'asset-experiments' into asset-engine

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenkernel/intern/object.c
source/blender/windowmanager/intern/wm_operators.c

Merge branch 'master' into ui-preview-buttons

Add 'readonly dict-like' behavior to high-level previews collection.

And some cleanup/rename/documentation/...

Rework previews handling to be 'simpler' on py-level, as discussed with Campbell

This removes ID-free previews handling from RNA, adds a low-level hidden API
in bpy.app._previews, and the real previews manager in bpy.utils.

There is still lots of cleanup and renaming to be done...

Support for UV and vertex color attributes of cached strands data.

Unlike particles, the Strands data stores UV coordinates and vertex
colors explicitly as a per-strand (const) property. This means Cycles
does not have to know the details of how particles map themselves to
a changing mesh surfaces (which is very complicated and fraught with
broken use cases and bugs). The UVs and colors are stored once for each
strand, since they are not expected to change over time (strands being
fixed to the mesh surface).

Alembic: Make group's write_sample() threaded

The idea is to evaluate derived meshes in multiple threads, which will
reduce overall write_sample() time. We can't make all routines threaded
in there because alembic's file IO can't be threaded.

In any case, this change gives 2x speedup of exporting render resolution
version of Franck here.