Blender Git Loki

Git Commits -> Revision fdf24d8

Revision fdf24d8 by Antonis Ryakiotakis (KTX_support)
August 14, 2015, 13:18 (GMT)
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

Commit Details:

Full Hash: fdf24d8899e1d8704cea97ce334c5c642681c4ec
Parent Commits: 8b286bf, e3c416e

Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021