Merge branch 'master' into blender2.8

2018-06-29 08:05:38 +02:00
parent be983295ea af36dd4664
commit 9bd0c63382
263 changed files with 0 additions and 281 deletions
--- a/source/blender/editors/physics/physics_ops.c
+++ b/source/blender/editors/physics/physics_ops.c
@@ -228,6 +228,3 @@ void ED_keymap_physics(wmKeyConfig *keyconf)
 	keymap_particle(keyconf);
 	//keymap_pointcache(keyconf);
 }
-
-
-