Blender Git Commits

now using separate flags for heat, fire, colors and highres

clean up strings for solver and gc

adapted setup for energy grid (now using high res)

Merge branch 'master' into HMD_viewport

Option for HMD view shading mode

Fixed crash when world is absent.

cleaned up include statements

removed a double bad level call stub, found by jensverwiebe, thanks :)

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

Conflicts:
source/blender/windowmanager/intern/wm_operators.c

now deleting python grid references properly

Fix compilation issue on linux.

Changed Splash version number

Fix #3 : Clamp mix factor.

Removing some debug printf

Merge branch 'master' of git://git.blender.org/blender

# Conflicts:
# release/datafiles/splash.png
# release/datafiles/splash_2x.png
# source/blender/gpu/GPU_material.h
# source/blender/gpu/shaders/gpu_shader_material.glsl
# source/blender/makesrna/intern/rna_image_api.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
# source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
# source/blender/nodes/shader/nodes/node_shader_fresnel.c
# source/blender/nodes/shader/nodes/node_shader_layer_weight.c
# source/blender/nodes/shader/nodes/node_shader_normal_map.c

Viewport Probe capture for bsdf preview:

- Added a GPUProbe generated by either the world or objects in the scene.
Updating is done by tagging the GPUProbe and waiting the gpu_update_probes call.
All probes are updated if the world changes and all objects probes are updated if an object in the scene changes. This must be optimize to ensure good performance with lots of probes.
For the moment no settings are available.

- Separated bsdf sampling code inside a new file.

- Spherical harmonic computation is now done on the GPU. Using only 64*64*6 samples for now.

- Lots of code cleaning and formating.

moved uv setup and calculations from step low to step high. not needed in step low

fixed broken destructor from previous commit

- Fixed correct event polling for all operating systems
- Fixed up openhmd cmake for windows builds

fixed formatting issue in MANTA