test2

Files

Bastien Montagne cfbd605567 Merge branch 'master' into blender2.8

Conflicts:
	intern/cycles/blender/addon/ui.py
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenkernel/intern/particle_distribute.c
	source/blender/blenkernel/intern/texture.c
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/physics/particle_object.c
	source/blender/editors/transform/transform_snap_object.c

2016-07-12 00:07:44 +02:00

bin

Simplify thumbnail blend parser

2015-08-17 12:37:38 +10:00

darwin

Revert "OSX/cpack: add a dummy bg and ds_store for dmg"

2014-11-18 11:40:16 +01:00

datafiles

UI Font: Fix bad kerning of Thai font.

2016-06-11 10:47:53 +02:00

freedesktop

Update of our *nix .desktop file.