← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/editors/physics/physics_ops.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-07-23 08:54:18 UTC
  • mfrom: (14.2.16 sid)
  • mto: (14.2.19 sid)
  • mto: This revision was merged to the branch mainline in revision 42.
  • Revision ID: package-import@ubuntu.com-20120723085418-9foz30v6afaf5ffs
Tags: 2.63a-2
http://bugs.debian.org/658075
* debian/: Cycles support added (Closes: #658075)
  For now, this top feature has been enabled only
  on [any-amd64 any-i386] architectures because
  of OpenImageIO failing on all others
* debian/: scripts installation path changed
  from /usr/lib to /usr/share:
  + debian/patches/: patchset re-worked for path changing
  + debian/control: "Breaks" field added on yafaray-exporter

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/physics/physics_ops.c
1
 
/**
2
 
 * $Id: physics_ops.c 30445 2010-07-17 18:02:10Z campbellbarton $
3
 
 *
 
1
/*
4
2
 * ***** BEGIN GPL LICENSE BLOCK *****
5
3
 *
6
4
 * This program is free software; you can redistribute it and/or
25
23
 * ***** END GPL LICENSE BLOCK *****
26
24
 */
27
25
 
 
26
/** \file blender/editors/physics/physics_ops.c
 
27
 *  \ingroup edphys
 
28
 */
 
29
 
 
30
 
28
31
#include <stdlib.h>
29
32
 
30
33
 
36
39
#include "ED_physics.h"
37
40
#include "ED_object.h"
38
41
 
 
42
#include "BLI_utildefines.h"
 
43
 
39
44
#include "physics_intern.h" // own include
40
45
 
 
46
 
41
47
/***************************** particles ***********************************/
42
48
 
43
49
static void operatortypes_particle(void)
48
54
        WM_operatortype_append(PARTICLE_OT_select_linked);
49
55
        WM_operatortype_append(PARTICLE_OT_select_less);
50
56
        WM_operatortype_append(PARTICLE_OT_select_more);
51
 
        WM_operatortype_append(PARTICLE_OT_select_inverse);
52
57
 
53
58
        WM_operatortype_append(PARTICLE_OT_hide);
54
59
        WM_operatortype_append(PARTICLE_OT_reveal);
61
66
        WM_operatortype_append(PARTICLE_OT_mirror);
62
67
 
63
68
        WM_operatortype_append(PARTICLE_OT_brush_edit);
64
 
        WM_operatortype_append(PARTICLE_OT_brush_radial_control);
65
69
 
66
70
        WM_operatortype_append(PARTICLE_OT_particle_edit_toggle);
67
71
        WM_operatortype_append(PARTICLE_OT_edited_clear);
86
90
 
87
91
static void keymap_particle(wmKeyConfig *keyconf)
88
92
{
 
93
        wmKeyMapItem *kmi;
89
94
        wmKeyMap *keymap;
90
95
        
91
 
        keymap= WM_keymap_find(keyconf, "Particle", 0, 0);
92
 
        keymap->poll= PE_poll;
 
96
        keymap = WM_keymap_find(keyconf, "Particle", 0, 0);
 
97
        keymap->poll = PE_poll;
93
98
        
94
 
        WM_keymap_add_item(keymap, "PARTICLE_OT_select_all", AKEY, KM_PRESS, 0, 0);
 
99
        kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_select_all", AKEY, KM_PRESS, 0, 0);
 
100
        RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
 
101
        kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
 
102
        RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
 
103
 
95
104
        WM_keymap_add_item(keymap, "PARTICLE_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
96
105
        WM_keymap_add_item(keymap, "PARTICLE_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0);
97
 
        WM_keymap_add_item(keymap, "PARTICLE_OT_select_linked", LKEY, KM_PRESS, 0, 0);
98
 
        RNA_boolean_set(WM_keymap_add_item(keymap, "PARTICLE_OT_select_linked", LKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "deselect", 1);
99
 
        WM_keymap_add_item(keymap, "PARTICLE_OT_select_inverse", IKEY, KM_PRESS, KM_CTRL, 0);
 
106
 
 
107
        kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_select_linked", LKEY, KM_PRESS, 0, 0);
 
108
        RNA_boolean_set(kmi->ptr, "deselect", FALSE);
 
109
        kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_select_linked", LKEY, KM_PRESS, KM_SHIFT, 0);
 
110
        RNA_boolean_set(kmi->ptr, "deselect", TRUE);
100
111
 
101
112
        WM_keymap_add_item(keymap, "PARTICLE_OT_delete", XKEY, KM_PRESS, 0, 0);
102
113
        WM_keymap_add_item(keymap, "PARTICLE_OT_delete", DELKEY, KM_PRESS, 0, 0);
103
114
 
104
115
        WM_keymap_add_item(keymap, "PARTICLE_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0);
105
 
        WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, 0, 0);
106
 
        RNA_enum_set(WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1);
 
116
        kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, 0, 0);
 
117
        RNA_boolean_set(kmi->ptr, "unselected", FALSE);
 
118
        kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0);
 
119
        RNA_boolean_set(kmi->ptr, "unselected", TRUE);
 
120
 
 
121
        kmi = WM_keymap_verify_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_ANY, 0);
 
122
        RNA_boolean_set(kmi->ptr, "release_confirm", TRUE);
107
123
 
108
124
        WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", LEFTMOUSE, KM_PRESS, 0, 0);
109
125
        WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
110
 
        RNA_enum_set(WM_keymap_add_item(keymap, "PARTICLE_OT_brush_radial_control", FKEY, KM_PRESS, 0, 0)->ptr, "mode", WM_RADIALCONTROL_SIZE);
111
 
        RNA_enum_set(WM_keymap_add_item(keymap, "PARTICLE_OT_brush_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", WM_RADIALCONTROL_STRENGTH);
 
126
 
 
127
        /* size radial control */
 
128
        kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, 0, 0);
 
129
        RNA_string_set(kmi->ptr, "data_path_primary", "tool_settings.particle_edit.brush.size");
 
130
 
 
131
        /* size radial control */
 
132
        kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0);
 
133
        RNA_string_set(kmi->ptr, "data_path_primary", "tool_settings.particle_edit.brush.strength");
112
134
 
113
135
        WM_keymap_add_menu(keymap, "VIEW3D_MT_particle_specials", WKEY, KM_PRESS, 0, 0);
114
136
        
115
137
        WM_keymap_add_item(keymap, "PARTICLE_OT_weight_set", KKEY, KM_PRESS, KM_SHIFT, 0);
116
138
 
117
 
        ED_object_generic_keymap(keyconf, keymap, 1);
 
139
        ED_object_generic_keymap(keyconf, keymap, 2);
118
140
}
119
141
 
120
142
/******************************* boids *************************************/
152
174
        WM_operatortype_append(PTCACHE_OT_remove);
153
175
}
154
176
 
 
177
/********************************* dynamic paint ***********************************/
 
178
 
 
179
static void operatortypes_dynamicpaint(void)
 
180
{
 
181
        WM_operatortype_append(DPAINT_OT_bake);
 
182
        WM_operatortype_append(DPAINT_OT_surface_slot_add);
 
183
        WM_operatortype_append(DPAINT_OT_surface_slot_remove);
 
184
        WM_operatortype_append(DPAINT_OT_type_toggle);
 
185
        WM_operatortype_append(DPAINT_OT_output_toggle);
 
186
}
 
187
 
155
188
//static void keymap_pointcache(wmWindowManager *wm)
156
189
//{
157
 
//      wmKeyMap *keymap= WM_keymap_find(wm, "Pointcache", 0, 0);
 
190
//      wmKeyMap *keymap = WM_keymap_find(wm, "Pointcache", 0, 0);
158
191
//      
159
192
//      WM_keymap_add_item(keymap, "PHYSICS_OT_bake_all", AKEY, KM_PRESS, 0, 0);
160
193
//      WM_keymap_add_item(keymap, "PHYSICS_OT_free_all", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
170
203
        operatortypes_boids();
171
204
        operatortypes_fluid();
172
205
        operatortypes_pointcache();
 
206
        operatortypes_dynamicpaint();
173
207
}
174
208
 
175
209
void ED_keymap_physics(wmKeyConfig *keyconf)