Blender Git Loki

Cycles: Use new ssef helpers for QBVH Triangle Intersection. No functional changes.

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

This commit removes somd sincos() code + fma(), as the code in master changed too much in those places. I will re-check on that and add back eventually.

Conflicts:
intern/cycles/CMakeLists.txt
intern/cycles/SConscript
intern/cycles/kernel/CMakeLists.txt
intern/cycles/kernel/closure/bsdf_microfacet.h
intern/cycles/kernel/geom/geom_bvh_shadow.h
intern/cycles/kernel/geom/geom_bvh_subsurface.h
intern/cycles/kernel/geom/geom_bvh_traversal.h
intern/cycles/kernel/kernel_compat_cpu.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/nodes.cpp
intern/cycles/util/util_color.h
intern/cycles/util/util_optimization.h
intern/cycles/util/util_simd.h
source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.c

Addressing mont29's code review

Also removed pointless #include "BKE_key.h" in transform_manipulator.c

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

Now I have a facny 2.71 splash too!

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Rename layout.pie to menu_pie

Minor changes and sync with master (reduce diff noise)

Rename WM_HANDLER_ACCEPT_DBLPRESS -> WM_HANDLER_ACCEPT_DBL_CLICK

also some minor changes for ui_centered_pie_bounds_block

Minor changes to WM_OT_context_operator_pie_enum

- dont eval("bpy.ops. ... ")
- split the operator name and property into 2 properties.

Code Cleanup: style

Merge branch 'master' into pie-menus

Conflicts:
source/blender/editors/interface/interface.c

Fixed yesterday's shape key compression

1) Shape key data would fail to link on file read, fixed now.

2) Endianess flipping now supports compressed shape keys, just have to
test (thanks ideasman42 for ideas)

3) Also removed some debug printfs

Working: line intersection, point in polygon, chalk cart

makeScreenshot - adding frame number to the filename

Fix for node lookup from RNA pointers, this has to ensure the pointer
is non-NULL before passing it to RNA functions.

Initial Commit

Implemented mesh shape key compression

Mesh shape keys are now compressed on file write by storing only the vertices that have changed from the rest position (the logic automatically determines if there will be a gain from such compression, if not, no compression will happen).

This showed 3x disk space reduction on Elizabeth's head here (4.5 kvert mesh, 157 shape keys for different facial expression):
http://dl.dropboxusercontent.com/u/91422001/liz_headonly_masterbranch.blend
http://cs617325.vk.me/v617325382/e0e1/cjnMXhbtU44.jpg

A User Preference (on File tab) has been added to save the shape keys in the old format (compressed shape keys won't be readable from Master branch)

This also decreases object mode undo memory usage, as undo uses a file in memory.

TODO: endian conversions won't work on compressed keys right now.

repositioning handled

cleanup related to EGL contexts
added EGL 1.5 entry points to glew-es
glew-es was assuming that EGL and ES always go together, but you can use EGL to initialize non-ES contexts
moved swap interval implementation to GHOST_Context classes
added EGLDisplay parameter to EGLEWInit in order to work around ARM Mali bug (but seems sensible compared to other EGL functions)
more checks before calling eglBindAPI, no need if there is no EGL display

resizing meshes accordingly, tweaks in SDF method call

Code optimization.
The system create a new vertex group, to put the results.