Blender Git Loki

Corrections to previous commit

Cleanup: Naming, no need to use widgetgroup->customdata

Merge branch 'master' into openvdb

Merge branch 'master' into GPencil_Editing_Stage3

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c

cleaning up repository

Merge branch 'master' into wiggly-widgets

Merge branch 'master' into soc-2014-fluid

Conflicts:
CMakeLists.txt
extern/CMakeLists.txt
extern/SConscript
intern/ghost/intern/GHOST_WindowCocoa.mm
source/creator/CMakeLists.txt

Some tweaks for introduction of draw-styles

Merge branch 'master' into temp-ui-widget-refactor

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

KTX file format:

Support flipped images.

Two issues here:

* We need to check the metadata for flipped flags
* We need to invert compressed images (they are stored
inverted on GPU).

Not sure if all combinations are correct here (missing reference
material to make the decision), so will assume all is OKish for now.

Revert "spherical-stereo with bump map (differentials) fix"

This reverts commit d8f6a9a97dd908849695c952301d47cb2b6b2eac.

spherical-stereo with bump map (differentials) fix

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

Merge branch 'master' into KTX_support

Conflicts:
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_ops.c
source/blender/gpu/intern/gpu_draw.c
source/blender/imbuf/IMB_imbuf_types.h
source/blender/imbuf/intern/allocimbuf.c
source/blender/imbuf/intern/cineon/cineon_dpx.c
source/blender/imbuf/intern/jp2.c
source/blender/imbuf/intern/jpeg.c
source/blender/imbuf/intern/openexr/openexr_api.cpp
source/blender/imbuf/intern/png.c
source/blender/imbuf/intern/targa.c
source/blender/imbuf/intern/tiff.c
source/blender/makesrna/intern/rna_image.c
source/gameengine/Ketsji/BL_Texture.cpp

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Fix bug in preview generator.

Some cleanup re master...

Merge branch 'master' into asset-experiments