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
blender-archive/source/gameengine/Ketsji
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
..
2016-01-04 14:20:48 +05:00
2015-10-28 15:13:12 +01:00
2016-06-11 22:24:18 +02:00
2016-06-11 22:24:18 +02:00
2015-11-03 10:31:08 +01:00
2013-03-18 11:44:56 +00:00
2016-06-11 22:05:20 +02:00
2014-10-07 15:47:32 -05:00
2012-09-16 04:58:18 +00:00
2015-03-23 21:43:42 +01:00
2012-09-16 04:58:18 +00:00
2012-09-16 04:58:18 +00:00
2016-06-11 22:05:20 +02:00
2013-03-26 07:29:01 +00:00
2012-09-16 04:58:18 +00:00
2012-09-16 04:58:18 +00:00