operator renaming for more consistent word ordering (_add/_remmove shold be last...
[blender-staging.git] / source / blender / editors / physics / physics_ops.c
index 0ebbfa6b701582178e2c41d6ce5bea764858be8c..b0d804da4579a9d93f4cad6689b22c63adb3df89 100644 (file)
@@ -35,6 +35,7 @@
 #include "WM_types.h"
 
 #include "ED_physics.h"
+#include "ED_object.h"
 
 #include "physics_intern.h" // own include
 
@@ -48,6 +49,7 @@ static void operatortypes_particle(void)
        WM_operatortype_append(PARTICLE_OT_select_linked);
        WM_operatortype_append(PARTICLE_OT_select_less);
        WM_operatortype_append(PARTICLE_OT_select_more);
+       WM_operatortype_append(PARTICLE_OT_select_inverse);
 
        WM_operatortype_append(PARTICLE_OT_hide);
        WM_operatortype_append(PARTICLE_OT_reveal);
@@ -73,12 +75,14 @@ static void operatortypes_particle(void)
 
        WM_operatortype_append(PARTICLE_OT_new);
        WM_operatortype_append(PARTICLE_OT_new_target);
-       WM_operatortype_append(PARTICLE_OT_remove_target);
+       WM_operatortype_append(PARTICLE_OT_target_remove);
        WM_operatortype_append(PARTICLE_OT_target_move_up);
        WM_operatortype_append(PARTICLE_OT_target_move_down);
        WM_operatortype_append(PARTICLE_OT_connect_hair);
        WM_operatortype_append(PARTICLE_OT_disconnect_hair);
 
+       WM_operatortype_append(PARTICLE_OT_dupliob_copy);
+       WM_operatortype_append(PARTICLE_OT_dupliob_remove);
        WM_operatortype_append(PARTICLE_OT_dupliob_move_up);
        WM_operatortype_append(PARTICLE_OT_dupliob_move_down);
 }
@@ -95,6 +99,7 @@ static void keymap_particle(wmKeyConfig *keyconf)
        WM_keymap_add_item(keymap, "PARTICLE_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_item(keymap, "PARTICLE_OT_select_linked", LKEY, KM_PRESS, 0, 0);
        RNA_boolean_set(WM_keymap_add_item(keymap, "PARTICLE_OT_select_linked", LKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "deselect", 1);
+       WM_keymap_add_item(keymap, "PARTICLE_OT_select_inverse", IKEY, KM_PRESS, KM_CTRL, 0);
 
        WM_keymap_add_item(keymap, "PARTICLE_OT_delete", XKEY, KM_PRESS, 0, 0);
        WM_keymap_add_item(keymap, "PARTICLE_OT_delete", DELKEY, KM_PRESS, 0, 0);
@@ -103,12 +108,14 @@ static void keymap_particle(wmKeyConfig *keyconf)
        WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, 0, 0);
        RNA_enum_set(WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1);
 
-       WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", ACTIONMOUSE, KM_PRESS, 0, 0);
-       WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0);
+       WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", LEFTMOUSE, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
        RNA_enum_set(WM_keymap_add_item(keymap, "PARTICLE_OT_brush_radial_control", FKEY, KM_PRESS, 0, 0)->ptr, "mode", WM_RADIALCONTROL_SIZE);
        RNA_enum_set(WM_keymap_add_item(keymap, "PARTICLE_OT_brush_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", WM_RADIALCONTROL_STRENGTH);
 
        WM_keymap_add_item(keymap, "PARTICLE_OT_specials_menu", WKEY, KM_PRESS, 0, 0);
+
+       ED_object_generic_keymap(keyconf, keymap, 1);
 }
 
 /******************************* boids *************************************/
@@ -142,7 +149,7 @@ static void operatortypes_pointcache(void)
        WM_operatortype_append(PTCACHE_OT_bake);
        WM_operatortype_append(PTCACHE_OT_free_bake);
        WM_operatortype_append(PTCACHE_OT_bake_from_cache);
-       WM_operatortype_append(PTCACHE_OT_add_new);
+       WM_operatortype_append(PTCACHE_OT_add);
        WM_operatortype_append(PTCACHE_OT_remove);
 }