diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 16:41:32 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 16:41:32 +0300 |
| commit | 6231a077ac96b546d41404ef423fc23e1fa01803 (patch) | |
| tree | 8c91217b49506ec6e7db7c48737e5ee6295df395 /source/blender/blenlib/BLI_rand.h | |
| parent | 1b5e3e1c019e5209b557f6699902d275b9bc67aa (diff) | |
| parent | a6585fa4b1a7a4dd4b5ea21efcee36c8460ff5ec (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_group.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_group.c
source/blender/editors/object/object_relations.c
source/blender/editors/physics/rigidbody_constraint.c
source/blender/editors/physics/rigidbody_object.c
source/blender/makesrna/intern/rna_group.c
Diffstat (limited to 'source/blender/blenlib/BLI_rand.h')
0 files changed, 0 insertions, 0 deletions