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 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

CMakeLists.txt

Transform Snap: initial snap context refactor

2016-04-22 16:36:53 +10:00

transform_constraints.c

Cleanup: use normalize_v#_length

2016-07-08 10:14:49 +10:00

transform_conversions.c

Merge branch 'master' into blender2.8

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

transform_generics.c

Merge branch 'master' into blender2.8