blender-archive

Archived

This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Files

History

Bastien Montagne 1bcf9217eb Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/BKE_pointcache.h
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/pointcache.c
	source/blender/editors/include/ED_particle.h
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/physics/particle_edit_undo.c
	source/blender/editors/physics/particle_object.c
	source/blender/editors/physics/physics_intern.h
	source/blender/editors/physics/physics_pointcache.c
	source/blender/editors/space_time/space_time.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/transform/transform_conversions.c
	source/blender/editors/transform/transform_generics.c
	source/blender/editors/transform/transform_manipulator.c
	source/blender/makesrna/intern/rna_object.c
	source/blender/makesrna/intern/rna_object_force.c
	source/blender/makesrna/intern/rna_sculpt_paint.c
	source/blenderplayer/bad_level_call_stubs/stubs.c

2018-06-13 15:36:24 +02:00

alembic

Cleanup: Moar G.main removal of Hell.

2018-06-11 12:15:14 +02:00

avi

Fix buffer overflows in TIFF, PNG, IRIS, DPX, HDR and AVI loading.

2018-01-17 19:59:47 +01:00

blenfont

Merge branch 'master' into blender2.8

2018-06-08 08:10:35 +02:00

blenkernel

Merge branch 'master' into blender2.8