Blender Git Loki

Update CMakeLists for ptex

Import ptex-2.0.42 into extern/ptex

Temporary squash commit of gpu_codegen.c cleanup

Reworked from scratch 'icon over previews' feature.

Previous implementation was horribly complicated in the end... sigh.

Fix crasher (Looks like PointerRNA->type can be NULL...).

Merge branch 'master' into asset-experiments

Fix rendering of clnors with flat faces.

Basically, you can define any custom normal on flat faces too, which makes
them (more or less) smooth... So simply consider all faces as smooth when
we have some lnors now.

Various cleanup...

Merge branch 'master' into temp_custom_loop_normals

Merge branch 'master' into temp_custom_loop_normals

Depsgraph: Disable 2 leftover debug prints, which were slowing down graph rebuid times

remove version hack for MeshDataTransfer (since this is reverted now)

Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier

Conflicts:
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c (reverse-merged from commit 4401500cac4d3ff6e29d8ba4cbc476df49d88424)

Revert "Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier"

This reverts commit 4401500cac4d3ff6e29d8ba4cbc476df49d88424, reversing
changes made to bdb170ca60e272500789f89c63d3393b040e5c8b.

Merge branch 'master' into multiview

Conflicts:
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/ocean.c
source/blender/blenkernel/intern/writeavi.c
source/blender/compositor/operations/COM_OutputFileOperation.cpp
source/blender/editors/object/object_bake_api.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/screendump.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/render/intern/source/pipeline.c

cleanup: strict warnings

Merge branch 'master' into multiview

Conflicts:
source/blender/render/intern/source/render_result.c

Cleanup: style

Depsgraph: Ensure Scene ID block has a corresponding ID block

Depsgraph: Inserting keyframes for the first time now rebuilds the depsgraph

Since animation playback now works only if there's a link to the time source node,
it is necessary to rebuild the depsgraph when animation gets added to a datablock
for the first time (i.e. when keyframing on a previously unkeyed datablock) to
ensure that such a link gets added. It is not however needed to keep adding this
on subsequent keyframing attempts.