synched with trunk at revision 30243
[blender.git] / source / blender / editors / object / object_ops.c
index 8959cdf..44b2cee 100644 (file)
@@ -113,7 +113,6 @@ void ED_operatortypes_object(void)
 
        WM_operatortype_append(OBJECT_OT_delete);
        WM_operatortype_append(OBJECT_OT_text_add);
-       WM_operatortype_append(OBJECT_OT_surface_add);
        WM_operatortype_append(OBJECT_OT_armature_add);
        WM_operatortype_append(OBJECT_OT_lamp_add);
        WM_operatortype_append(OBJECT_OT_camera_add);
@@ -138,8 +137,8 @@ void ED_operatortypes_object(void)
        WM_operatortype_append(OBJECT_OT_multires_subdivide);
        WM_operatortype_append(OBJECT_OT_multires_reshape);
        WM_operatortype_append(OBJECT_OT_multires_higher_levels_delete);
-       WM_operatortype_append(OBJECT_OT_multires_save_external);
-       WM_operatortype_append(OBJECT_OT_multires_pack_external);
+       WM_operatortype_append(OBJECT_OT_multires_external_save);
+       WM_operatortype_append(OBJECT_OT_multires_external_pack);
        WM_operatortype_append(OBJECT_OT_meshdeform_bind);
        WM_operatortype_append(OBJECT_OT_explode_refresh);
        
@@ -184,6 +183,7 @@ void ED_operatortypes_object(void)
        WM_operatortype_append(OBJECT_OT_game_property_new);
        WM_operatortype_append(OBJECT_OT_game_property_remove);
        WM_operatortype_append(OBJECT_OT_game_property_copy);
+       WM_operatortype_append(OBJECT_OT_game_property_clear);
        WM_operatortype_append(OBJECT_OT_logic_bricks_copy);
 
        WM_operatortype_append(OBJECT_OT_shape_key_add);
@@ -389,17 +389,17 @@ void ED_object_generic_keymap(struct wmKeyConfig *keyconf, struct wmKeyMap *keym
        if(do_pet > 0) {
                /* context ops */
                kmi = WM_keymap_add_item(keymap, "WM_OT_context_cycle_enum", OKEY, KM_PRESS, KM_SHIFT, 0);
-               RNA_string_set(kmi->ptr, "path", "tool_settings.proportional_editing_falloff");
+               RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_editing_falloff");
 
                kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY, KM_PRESS, 0, 0);
-               RNA_string_set(kmi->ptr, "path", "tool_settings.proportional_editing");
+               RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_editing");
                RNA_string_set(kmi->ptr, "value_1", "DISABLED");
                RNA_string_set(kmi->ptr, "value_2", "ENABLED");
 
                /* for modes/object types that allow 'conencted' mode, add the Alt O key */
                if (do_pet > 1) {
                        kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY, KM_PRESS, KM_ALT, 0);
-                       RNA_string_set(kmi->ptr, "path", "tool_settings.proportional_editing");
+                       RNA_string_set(kmi->ptr, "data_path", "tool_settings.proportional_editing");
                        RNA_string_set(kmi->ptr, "value_1", "DISABLED");
                        RNA_string_set(kmi->ptr, "value_2", "CONNECTED");
                }