Blender Git Loki

Merge branch 'temp_manipulators_core' into custom-manipulators

Conflicts:
source/blender/blenkernel/BKE_screen.h
source/blender/blenkernel/intern/screen.c
source/blender/editors/interface/resources.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/space_api/spacetypes.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/manipulators/WM_manipulator_api.h
source/blender/windowmanager/manipulators/WM_manipulator_types.h
source/blender/windowmanager/manipulators/intern/wm_manipulator.c
source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c
source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h

Regions now use a single manipulator-map again

Instead of having multiple manipulator-maps for 2D and 3D manipulators, manipulator-group-types should be tagged as being either 2D or 3D. When it comes to drawing these can be drawn separately.
Note that more work needs to be done here (added some todo marks), but there are probably going to be quite a few issues when merging into custom_manipulators, so will handle these first.

crash fix for direct text fracture (prefractured) -> bmesh use_toolflags set incorrectly

Complement fixup for 4a1feaa5558ed603 (texture shaders)

We now multiply the alpha by the image alpha (as per severin
suggestion).
That still doesn't solve the main question of user preference drawing
black.

Fix animation transition in region overlay not working since 4a1feaa5

We still have stills with the User Preference window, though.

Fix T49478: triangulate of face hangs Blender.

Another case of float imprecision leading to endless loop. INcreasing a bit 'noise threashold' seems to work OK.

Not a regression, but might be nice to have in 2.78a.

WIP pose library stuff

Cycles: Cleanup, indentation

Cycles: Fix compilation error with minimal feature set

Fix T49471: Vertex Connect randomly broken.

Not sure where this comes from, but code was converting BMEdge* to BMVert* to check oflags,
i.e. not accessing correct memory.

Regression, to be backported to 2.78a.

Fixes for pose library change 601ce6a89c4

Apparently the keying sets system doesn't support subclassing
KeyingSetInfo subclasses. I have added a note to the top of the file to
indicate this to future developers.

Curve pinning: Allow pinning object data without animated object

Special case, so now we can pin tricky cases like animated camera DOF
without requiring to have animation on the object level.

Fix T49460: Particle group instance 'Use Count' value gets reset on file-load.

Regression caused rBbcc863993ad, write code was assuming dw->ob was always valid,
wich is no more the case right after reading file e.g.

Another good example of how bad it is to use 'hidden' dependencies between datablocks. :(
And another fix to be backported to 2.78a. :(((

POSELIB_OT_pose_add: only create keyframes for selected bones.

Previously the pose library used the WholeCharacter key set, which ignores
selection and add keys for almost all bones in the rig. This is a very
slow operation on complex rigs. With this patch, only selected bones are
keyed, defaulting to keying all bones when none are selected.

Note that this fixes the FIXME previously mentioned in the source.

windows compile fix

fix Mac build for Xcode < 8

We need a long-term fix, but this will get 2.78 out the door.

Fix missing properties editor update when changing 3D View camera

Actually two errors here:
* Properties editor wasn't refreshing on (NC_SCENE | ND_RENDER_OPTIONS) notifiers
* Was using notifier info bits wrongly, needs to send two separate notifiers

Decided to remove ND_RENDER_OPTIONS rather than adding properties editor scene context refresh for it, this is more than a render option change.

added new bmesh boolean solver to fracture modifier as well

merge compile fixes

Merge remote-tracking branch 'refs/remotes/origin/blender-v2.78-release' into fracture_modifier

Conflicts:
CMakeLists.txt
build_files/build_environment/install_deps.sh
build_files/cmake/macros.cmake
doc/python_api/sphinx_doc_gen.sh
intern/cycles/app/CMakeLists.txt
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_sync.cpp
intern/cycles/kernel/bvh/bvh.h
intern/cycles/kernel/geom/geom_bvh_volume.h
intern/cycles/kernel/geom/geom_bvh_volume_all.h
intern/cycles/kernel/kernel_volume.h
intern/cycles/kernel/kernels/opencl/kernel.cl
intern/cycles/kernel/shaders/node_subsurface_scattering.osl
intern/cycles/kernel/svm/svm_closure.h
intern/cycles/util/util_vector.h
release/datafiles/splash.png
release/datafiles/splash_2x.png
release/scripts/addons
source/blender/blenfont/intern/blf_font.c
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_mesh_mapping.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/particle_distribute.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/speaker.c
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/intern/bmesh_core.c
source/blender/bmesh/intern/bmesh_polygon.c
source/blender/editors/gpencil/gpencil_brush.c
source/blender/editors/gpencil/gpencil_ops.c
source/blender/editors/object/object_relations.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/transform/transform_snap.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_camera.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c
source/blender/nodes/shader/nodes/node_shader_bump.c
source/blender/nodes/shader/nodes/node_shader_fresnel.c
source/blender/nodes/shader/nodes/node_shader_normal_map.c
source/blender/render/intern/source/render_result.c
source/blender/render/intern/source/render_texture.c
source/blender/windowmanager/WM_api.h
source/creator/CMakeLists.txt