Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / physics / physics_ops.c
index f37c263..ffa73b4 100644 (file)
@@ -111,10 +111,10 @@ static void keymap_particle(wmKeyConfig *keyconf)
 {
        wmKeyMapItem *kmi;
        wmKeyMap *keymap;
-       
+
        keymap = WM_keymap_find(keyconf, "Particle", 0, 0);
        keymap->poll = PE_poll;
-       
+
        kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_select_all", AKEY, KM_PRESS, 0, 0);
        RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
        kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
@@ -149,7 +149,7 @@ static void keymap_particle(wmKeyConfig *keyconf)
        RNA_string_set(kmi->ptr, "data_path_primary", "tool_settings.particle_edit.brush.strength");
 
        WM_keymap_add_menu(keymap, "VIEW3D_MT_particle_specials", WKEY, KM_PRESS, 0, 0);
-       
+
        WM_keymap_add_item(keymap, "PARTICLE_OT_weight_set", KKEY, KM_PRESS, KM_SHIFT, 0);
 
        ED_keymap_proportional_cycle(keyconf, keymap);
@@ -205,7 +205,7 @@ static void operatortypes_dynamicpaint(void)
 //static void keymap_pointcache(wmWindowManager *wm)
 //{
 //     wmKeyMap *keymap = WM_keymap_find(wm, "Pointcache", 0, 0);
-//     
+//
 //     WM_keymap_add_item(keymap, "PHYSICS_OT_bake_all", AKEY, KM_PRESS, 0, 0);
 //     WM_keymap_add_item(keymap, "PHYSICS_OT_free_all", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
 //     WM_keymap_add_item(keymap, "PHYSICS_OT_bake_particle_system", PADMINUS, KM_PRESS, KM_CTRL, 0);