Blender Git Loki

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Rework job multi-level listing - factorize even more and avoid recursion.

This is much cleaner than previous code...

Merge remote-tracking branch 'origin/master' into multiview

So many conflicts ;) well, we survived the Viewport Shader project
merge

Conflicts:
source/blender/blenkernel/BKE_camera.h
source/blender/blenkernel/intern/camera.c
source/blender/blenloader/intern/versioning_270.c
source/blender/compositor/nodes/COM_ImageNode.cpp
source/blender/editors/include/ED_view3d.h
source/blender/editors/render/render_opengl.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_camera.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c

Merge branch 'master' into asset-experiments

Use a default handler for printing Alembic errors in case no explicit
error handler is used, to avoid silent failure.

Improve filtering across Ptex corners

Sanity check when trying to write cloth cache, the cloth data may not
actually exist.

Use a realistic time scale for cloth sim.

Return a boolean value indicating success when getting the frame range
of a cache.

Also the default cache range is return in case no archive exists.

fix: trigger system now triggers in time, there was a delay before due to unnecessary postponed revalidation, now the shards are directly activated on hit

Depsgraph: Avoid duplicated relations from being created

This is also not totally bad thing, but avoid duplicated relations
would help making depsgraph traversal more optimal at least. Plus
it'll give some memory save :)

Code which ensures there's no duplicated relations is commented out
still since IK solvers still needs more work for this.

Removed unused code.

Depsgraph: Make sure we don't try to create operations twice

This isn't totally bad, but might confuse depsgraph a bit.

Painstakingly merge branch 'master' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_camera.h
source/blender/blenkernel/BKE_screen.h
source/blender/blenkernel/intern/camera.c
source/blender/blenkernel/intern/screen.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/render/render_opengl.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_compositing.h
source/blender/gpu/GPU_extensions.h
source/blender/gpu/intern/gpu_compositing.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/shaders/gpu_shader_fx_dof_frag.glsl
source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl
source/blender/gpu/shaders/gpu_shader_fx_lib.glsl
source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl
source/blender/gpu/shaders/gpu_shader_fx_vert.glsl
source/blender/makesdna/DNA_camera_types.h
source/blender/makesdna/DNA_gpu_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_camera.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c

Merge branch 'master' into depsgraph_refactor

Better method for updating adjacent Ptex borders

Move extern/ptex to intern/ptex

Merge remote-tracking branch 'origin/master' into cycles-ptex-49

Depsgraph: Fix crash when trying to tag NULL for recalc

I would say it's better to be avoid to tag NULL for update, but old
depsgraph allowed that and nobody id check for it.