svn merge ^/trunk/blender -r45927:HEAD --accept=theirs-full
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Wed, 9 May 2012 14:55:50 +0000 (14:55 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Wed, 9 May 2012 14:55:50 +0000 (14:55 +0000)
This revision does not compile. code need to be merged in manualy.

1  2 
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c

index 8ba64e66025dacdcee644d2d833c498d954d6580,e834c93b0d86c4eb1a9f255f08a11decee9c914c..e29ab687fffb29021f961c1fcda81fdfc1fdcb4d
@@@ -84,6 -84,7 +84,7 @@@ void OBJECT_OT_proxy_make(struct wmOper
  void OBJECT_OT_shade_smooth(struct wmOperatorType *ot);
  void OBJECT_OT_shade_flat(struct wmOperatorType *ot);
  void OBJECT_OT_paths_calculate(struct wmOperatorType *ot);
+ void OBJECT_OT_paths_update(struct wmOperatorType *ot);
  void OBJECT_OT_paths_clear(struct wmOperatorType *ot);
  void OBJECT_OT_forcefield_toggle(struct wmOperatorType *ot);
  
@@@ -185,7 -186,7 +186,7 @@@ void CONSTRAINT_OT_limitdistance_reset(
  void CONSTRAINT_OT_childof_set_inverse(struct wmOperatorType *ot);
  void CONSTRAINT_OT_childof_clear_inverse(struct wmOperatorType *ot);
  void CONSTRAINT_OT_objectsolver_set_inverse(struct wmOperatorType *ot);
- void CONSTRAINT_OT_objectsolver_clear_inverse (struct wmOperatorType *ot);
+ void CONSTRAINT_OT_objectsolver_clear_inverse(struct wmOperatorType *ot);
  
  /* object_vgroup.c */
  void OBJECT_OT_vertex_group_add(struct wmOperatorType *ot);
@@@ -196,7 -197,6 +197,7 @@@ void OBJECT_OT_vertex_group_select(stru
  void OBJECT_OT_vertex_group_deselect(struct wmOperatorType *ot);
  void OBJECT_OT_vertex_group_copy_to_linked(struct wmOperatorType *ot);
  void OBJECT_OT_vertex_group_copy_to_selected(struct wmOperatorType *ot);
 +void OBJECT_OT_vertex_group_copy_to_selected_single(struct wmOperatorType *ot);
  void OBJECT_OT_vertex_group_copy(struct wmOperatorType *ot);
  void OBJECT_OT_vertex_group_normalize(struct wmOperatorType *ot);
  void OBJECT_OT_vertex_group_normalize_all(struct wmOperatorType *ot);
index 43385ea80a314771acc09d5331546b3d06f97b06,b7dc3fd7bea4ac2a8cd196b7bc0107d7b9c33419..9f5ae7e255f972c0f547d329c1cf08434e49bed5
@@@ -77,6 -77,7 +77,7 @@@ void ED_operatortypes_object(void
        WM_operatortype_append(OBJECT_OT_shade_smooth);
        WM_operatortype_append(OBJECT_OT_shade_flat);
        WM_operatortype_append(OBJECT_OT_paths_calculate);
+       WM_operatortype_append(OBJECT_OT_paths_update);
        WM_operatortype_append(OBJECT_OT_paths_clear);
        WM_operatortype_append(OBJECT_OT_forcefield_toggle);
  
        WM_operatortype_append(OBJECT_OT_vertex_group_deselect);
        WM_operatortype_append(OBJECT_OT_vertex_group_copy_to_linked);
        WM_operatortype_append(OBJECT_OT_vertex_group_copy_to_selected);
 +      WM_operatortype_append(OBJECT_OT_vertex_group_copy_to_selected_single);
        WM_operatortype_append(OBJECT_OT_vertex_group_copy);
        WM_operatortype_append(OBJECT_OT_vertex_group_normalize);
        WM_operatortype_append(OBJECT_OT_vertex_group_normalize_all);
@@@ -223,18 -223,18 +224,18 @@@ void ED_operatormacros_object(void
        wmOperatorType *ot;
        wmOperatorTypeMacro *otmacro;
        
-       ot = WM_operatortype_append_macro("OBJECT_OT_duplicate_move", "Duplicate Objects", OPTYPE_UNDO|OPTYPE_REGISTER);
+       ot = WM_operatortype_append_macro("OBJECT_OT_duplicate_move", "Duplicate Objects",
+                                         "Duplicate selected objects and move them", OPTYPE_UNDO | OPTYPE_REGISTER);
        if (ot) {
-               ot->description = "Duplicate selected objects and move them";
                WM_operatortype_macro_define(ot, "OBJECT_OT_duplicate");
                otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
                RNA_enum_set(otmacro->ptr, "proportional", PROP_EDIT_OFF);
        }
  
        /* grr, should be able to pass options on... */
-       ot = WM_operatortype_append_macro("OBJECT_OT_duplicate_move_linked", "Duplicate Linked", OPTYPE_UNDO|OPTYPE_REGISTER);
+       ot = WM_operatortype_append_macro("OBJECT_OT_duplicate_move_linked", "Duplicate Linked",
+                                         "Duplicate selected objects and move them", OPTYPE_UNDO | OPTYPE_REGISTER);
        if (ot) {
-               ot->description = "Duplicate selected objects and move them";
                otmacro = WM_operatortype_macro_define(ot, "OBJECT_OT_duplicate");
                RNA_boolean_set(otmacro->ptr, "linked", TRUE);
                otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
        }
        
        /* XXX */
-       ot = WM_operatortype_append_macro("OBJECT_OT_add_named_cursor", "Add named object at cursor", OPTYPE_UNDO|OPTYPE_REGISTER);
+       ot = WM_operatortype_append_macro("OBJECT_OT_add_named_cursor", "Add Named At Cursor",
+                                         "Add named object at cursor", OPTYPE_UNDO | OPTYPE_REGISTER);
        if (ot) {
-               ot->description = "Add named object at cursor";
-               RNA_def_string(ot->srna, "name", "Cube", MAX_ID_NAME-2, "Name", "Object name to add");
+               RNA_def_string(ot->srna, "name", "Cube", MAX_ID_NAME - 2, "Name", "Object name to add");
  
                WM_operatortype_macro_define(ot, "VIEW3D_OT_cursor3d");
                WM_operatortype_macro_define(ot, "OBJECT_OT_add_named");
  
  static int object_mode_poll(bContext *C)
  {
-       Object *ob= CTX_data_active_object(C);
+       Object *ob = CTX_data_active_object(C);
        return (!ob || ob->mode == OB_MODE_OBJECT);
  }
  
@@@ -284,7 -284,7 +285,7 @@@ void ED_keymap_object(wmKeyConfig *keyc
        RNA_enum_set(kmi->ptr, "mode", OB_MODE_WEIGHT_PAINT);
        RNA_boolean_set(kmi->ptr, "toggle", TRUE);
        
-       WM_keymap_add_item(keymap, "OBJECT_OT_origin_set", CKEY, KM_PRESS, KM_ALT|KM_SHIFT|KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "OBJECT_OT_origin_set", CKEY, KM_PRESS, KM_ALT | KM_SHIFT | KM_CTRL, 0);
  
        /* Object Mode ---------------------------------------------------------------- */
        /* Note: this keymap gets disabled in non-objectmode,  */
  
        WM_keymap_add_item(keymap, "OBJECT_OT_select_linked", LKEY, KM_PRESS, KM_SHIFT, 0);
        WM_keymap_add_item(keymap, "OBJECT_OT_select_grouped", GKEY, KM_PRESS, KM_SHIFT, 0);
-       WM_keymap_add_item(keymap, "OBJECT_OT_select_mirror", MKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
+       WM_keymap_add_item(keymap, "OBJECT_OT_select_mirror", MKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
        
        kmi = WM_keymap_add_item(keymap, "OBJECT_OT_select_hierarchy", LEFTBRACKETKEY, KM_PRESS, 0, 0);
        RNA_enum_set_identifier(kmi->ptr, "direction", "PARENT");
        RNA_boolean_set(kmi->ptr, "extend", TRUE);
  
        WM_keymap_verify_item(keymap, "OBJECT_OT_parent_set", PKEY, KM_PRESS, KM_CTRL, 0);
-       WM_keymap_verify_item(keymap, "OBJECT_OT_parent_no_inverse_set", PKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
+       WM_keymap_verify_item(keymap, "OBJECT_OT_parent_no_inverse_set", PKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
        WM_keymap_verify_item(keymap, "OBJECT_OT_parent_clear", PKEY, KM_PRESS, KM_ALT, 0);
        WM_keymap_verify_item(keymap, "OBJECT_OT_track_set", TKEY, KM_PRESS, KM_CTRL, 0);
        WM_keymap_verify_item(keymap, "OBJECT_OT_track_clear", TKEY, KM_PRESS, KM_ALT, 0);
        
-       WM_keymap_verify_item(keymap, "OBJECT_OT_constraint_add_with_targets", CKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
-       WM_keymap_verify_item(keymap, "OBJECT_OT_constraints_clear", CKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
+       WM_keymap_verify_item(keymap, "OBJECT_OT_constraint_add_with_targets", CKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
+       WM_keymap_verify_item(keymap, "OBJECT_OT_constraints_clear", CKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
        
        WM_keymap_verify_item(keymap, "OBJECT_OT_location_clear", GKEY, KM_PRESS, KM_ALT, 0);
        WM_keymap_verify_item(keymap, "OBJECT_OT_rotation_clear", RKEY, KM_PRESS, KM_ALT, 0);
        RNA_boolean_set(kmi->ptr, "unselected", TRUE);
  
        /* same as above but for rendering */
-       WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_clear", HKEY, KM_PRESS, KM_ALT|KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_clear", HKEY, KM_PRESS, KM_ALT | KM_CTRL, 0);
        WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_set", HKEY, KM_PRESS, KM_CTRL, 0);
  
        /* conflicts, removing */
  #if 0
-       kmi = WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_set", HKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)
-       RNA_boolean_set(kmi->ptr, "unselected", TRUE);
+       kmi = WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_set", HKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0)
+             RNA_boolean_set(kmi->ptr, "unselected", TRUE);
  #endif
  
        WM_keymap_add_item(keymap, "OBJECT_OT_move_to_layer", MKEY, KM_PRESS, 0, 0);
  
        WM_keymap_add_menu(keymap, "INFO_MT_add", AKEY, KM_PRESS, KM_SHIFT, 0);
  
-       WM_keymap_add_item(keymap, "OBJECT_OT_duplicates_make_real", AKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "OBJECT_OT_duplicates_make_real", AKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0);
  
        WM_keymap_add_menu(keymap, "VIEW3D_MT_object_apply", AKEY, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_menu(keymap, "VIEW3D_MT_make_single_user", UKEY, KM_PRESS, 0, 0);
        
        WM_keymap_add_item(keymap, "OBJECT_OT_join", JKEY, KM_PRESS, KM_CTRL, 0);
        WM_keymap_add_item(keymap, "OBJECT_OT_convert", CKEY, KM_PRESS, KM_ALT, 0);
-       WM_keymap_add_item(keymap, "OBJECT_OT_proxy_make", PKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
+       WM_keymap_add_item(keymap, "OBJECT_OT_proxy_make", PKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
        WM_keymap_add_item(keymap, "OBJECT_OT_make_local", LKEY, KM_PRESS, 0, 0);
  
        // XXX this should probably be in screen instead... here for testing purposes in the meantime... - Aligorith
        WM_keymap_verify_item(keymap, "ANIM_OT_keyframe_insert_menu", IKEY, KM_PRESS, 0, 0);
        WM_keymap_verify_item(keymap, "ANIM_OT_keyframe_delete_v3d", IKEY, KM_PRESS, KM_ALT, 0);
-       WM_keymap_verify_item(keymap, "ANIM_OT_keying_set_active_set", IKEY, KM_PRESS, KM_CTRL|KM_SHIFT|KM_ALT, 0);
+       WM_keymap_verify_item(keymap, "ANIM_OT_keying_set_active_set", IKEY, KM_PRESS, KM_CTRL | KM_SHIFT | KM_ALT, 0);
        
        WM_keymap_verify_item(keymap, "GROUP_OT_create", GKEY, KM_PRESS, KM_CTRL, 0);
-       WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove", GKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
-       WM_keymap_verify_item(keymap, "GROUP_OT_objects_add_active", GKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
-       WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove_active", GKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0);
+       WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove", GKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
+       WM_keymap_verify_item(keymap, "GROUP_OT_objects_add_active", GKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0);
+       WM_keymap_verify_item(keymap, "GROUP_OT_objects_remove_active", GKEY, KM_PRESS, KM_SHIFT | KM_ALT, 0);
  
        WM_keymap_add_menu(keymap, "VIEW3D_MT_object_specials", WKEY, KM_PRESS, 0, 0);
  
-       for (i=0; i<=5; i++) {
-               kmi = WM_keymap_add_item(keymap, "OBJECT_OT_subdivision_set", ZEROKEY+i, KM_PRESS, KM_CTRL, 0);
+       for (i = 0; i <= 5; i++) {
+               kmi = WM_keymap_add_item(keymap, "OBJECT_OT_subdivision_set", ZEROKEY + i, KM_PRESS, KM_CTRL, 0);
                RNA_int_set(kmi->ptr, "level", i);
        }