Blender Git Loki

Merge branch 'master' into blender2.8

# Conflicts:
# source/blender/blenloader/intern/writefile.c

Fix T49249: Alembic export with multiple hair systems crash blender

Removed unnecessary call to DM_update_tessface_data(). This call is
already performed by DM_ensure_tessface(dm). The call being performed
twice caused a failing BLI_assert().

Reviewed by: K�vin Dietrich

Alembic export: avoid infinite loops trying to find parent objects.

Also added some assertions for debugging purposes

Reviewed by: K�vin Dietrich

Alembic export: only create transform writer if the object should be exported

Reviewed by: K�vin Dietrich

Alembic: #undef'ed the correct macro

TEST_RET is not defined anywhere in Blender's sources, and LAYER_CMP
is no longer used after this function ends.

Alembic: Use getXForm() in check, because it's used in rest of the function too

This makes the code within the function consistent.

Alembic: Renamed copy_zup_yup to copy_yup_from_zup (and same for zup_from_yup)

With the new names the arguments (yup, zup) are in the same order as
they appear in the function name. The old names used copy_src_dst(dst,
src), which I found very confusing. Furthermore, now it is clear from
where to where the copy is made.

This makes the function names a little bit longer, though. If that is
a real issue, we can just name them zup_from_yup(zup, yup).

Reviewed by: K�vin Dietrich

OpenGL immediate mode: interface_draw.c (cont)

ui_draw_but_CURVE

Merge branch 'master' into id_override_static

cleanup from recent commits

coding style, float literals

Converted some (expr / literal) to (expr * literal) where it does not impact readability.

Simplified a few function calls.

OpenGL immediate mode: clip_graph_draw.c

Part of T49043 and T49042

OpenGL immediate mode: gluSphere replacement

Updated interface_draw.c to use the new sphere batch.

OpenGL immediate mode: fix Waveform Font color

OpenGL immediate mode: interface_draw.c (cont)

ui_draw_but_UNITVEC
Introduced a new shader to be used for simple lighting.

OpenGL immediate mode: interface_draw.c (cont)

ui_draw_but_COLORBAND
Introduced a new checker shader to be used mostly on transparent areas.

Draw tables row by row, not column by column

OpenGL immediate mode: Convert leftover UI_ThemeColor calls

Some `UI_ThemeColor` calls were left in converted files, in some cases
because they were just overlooked, and in the case of text drawing,
because the new BLF color functions were not yet implemented at the
time of conversion.

Also converted one `drawcircball` call that was left in
transform_constraints.c

Part of T49043

fix clang warning

uninitialized variable (glGen functions set the value)

OpenGL immediate mode: uvedit_draw.c

Still has one `UI_ThemeColor` call, because drawing is happening in a DM
drawing callback which hasn't been converted yet.

Also has some old gl calls that are #ifdef'ed out.

This also changes active face drawing in UVs from stippled to a solid
color, which makes active faces much more visible, and also looks nicer.
The same should probably be done for active face drawing in the 3d view.
(has been discussed with merwin on IRC)

Part of T49043

Preliminary step to support static override of armatures.

I.e. support override of loc/rot/scale of posechannels.

Also implied to add some minimal support of collections in 'diff
generating' RNA code.

Still much to be done of course.