test/animation at 39259fc8ab2da78cf5de5ef59079657bbf01acff - test

Files

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

Conflicts:
	release/scripts/startup/bl_ui/properties_particle.py
	release/scripts/startup/bl_ui/properties_physics_cloth.py
	release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
	release/scripts/startup/bl_ui/properties_physics_softbody.py
	source/blender/blenkernel/BKE_library.h
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/cloth.c
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/library_query.c
	source/blender/blenkernel/intern/particle_system.c
	source/blender/blenkernel/intern/scene.c
	source/blender/blenkernel/intern/softbody.c
	source/blender/blenloader/intern/readfile.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/space_file/filesel.c
	source/blender/editors/space_outliner/outliner_intern.h
	source/blender/makesdna/DNA_ID.h
	source/blender/makesdna/DNA_object_force.h
	source/blender/makesdna/DNA_particle_types.h
	source/blender/makesrna/intern/rna_particle.c
	source/blender/makesrna/intern/rna_sculpt_paint.c
	source/blender/makesrna/intern/rna_smoke.c
	source/blender/makesrna/intern/rna_space.c

2016-08-06 12:45:03 +02:00

anim_channels_defines.c

Merge branch 'master' into blender2.8

2016-08-06 12:45:03 +02:00

anim_channels_edit.c

Merge branch 'master' into blender2.8

2016-08-06 12:45:03 +02:00

anim_deps.c

Fix T48529: NLA : viewport not updated after Track muted/unmuted.

2016-05-28 19:52:31 +02:00

anim_draw.c

OpenGL: call glLineWidth less often