← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/editors/metaball/mball_ops.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/metaball/mball_ops.c
28
28
 *  \ingroup edmeta
29
29
 */
30
30
 
31
 
 
32
 
#include "WM_api.h"
33
 
#include "WM_types.h"
34
 
 
35
31
#include "RNA_access.h"
36
32
 
37
33
#include "ED_mball.h"
40
36
 
41
37
#include "BLI_utildefines.h"
42
38
 
 
39
#include "WM_api.h"
 
40
#include "WM_types.h"
 
41
 
43
42
#include "mball_intern.h"
44
43
 
45
44
void ED_operatortypes_metaball(void)
75
74
        WM_keymap_add_item(keymap, "MBALL_OT_duplicate_metaelems", DKEY, KM_PRESS, KM_SHIFT, 0);
76
75
        
77
76
        kmi = WM_keymap_add_item(keymap, "MBALL_OT_select_all", AKEY, KM_PRESS, 0, 0);
78
 
                RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
 
77
        RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
79
78
        kmi = WM_keymap_add_item(keymap, "MBALL_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
80
 
                RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
 
79
        RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
81
80
 
82
 
        ED_object_generic_keymap(keyconf, keymap, 3);
 
81
        ED_keymap_proportional_cycle(keyconf, keymap);
 
82
        ED_keymap_proportional_editmode(keyconf, keymap, TRUE);
83
83
}
84
84