Blender Git Loki

fix: for severe performance issue with fractal, did unnecessary unwrapping operations there

Merge branch 'master' into gooseberry

Fix typo in Ptex CMakeLists

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

Conflicts:
intern/cycles/kernel/kernel_types.h
intern/cycles/render/attribute.cpp

Avoid creating new images on Ptex resolution change

Add function to force refresh of Ptex packed image

Revert "Bake-API: reduce memory footprint when baking more than one object [test"

This reverts commit 087ee57dbaa2f90354f985cfc3b8320c1ce3df90.

Bake-API: reduce memory footprint when baking more than one object [test
build]

Merge remote-tracking branch 'origin/master' into experimental-build

Cleanup: Use enums where appropriate instead of #defines.

Merge branch 'master' into gooseberry

Revert "Code cleanup: remove unused function BKE_image_assign_ibuf"

This reverts commit 567e147f619b1a51eecebccaaff39030362fd2f4.

Minor simplification

Merge branch 'master' into alembic_pointcache

Conflicts:
CMakeLists.txt
build_files/build_environment/install_deps.sh
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/pointcache.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c
source/blender/render/intern/source/voxeldata.c

Merge branch 'master' into gooseberry

Cleanup redundant state changes

Use an enum for enabled GPU Fx

Forward compatibility: Use triangle strips instead of quads

Add second widget call in-scene

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