Revision: 47211
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47211
Author: campbellbarton
Date: 2012-05-30 08:04:06 +0000 (Wed, 30 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47201:47210
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47201
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/editors/curve/curve_ops.c
branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_ops.c
branches/soc-2011-tomato/source/blender/editors/metaball/mball_ops.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-47201
+
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-47210
Modified: branches/soc-2011-tomato/source/blender/editors/curve/curve_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/curve/curve_ops.c
2012-05-30 08:02:49 UTC (rev 47210)
+++ branches/soc-2011-tomato/source/blender/editors/curve/curve_ops.c
2012-05-30 08:04:06 UTC (rev 47211)
@@ -264,6 +264,7 @@
/* menus */
WM_keymap_add_menu(keymap, "VIEW3D_MT_hook", HKEY, KM_PRESS, KM_CTRL,
0);
- ED_object_generic_keymap(keyconf, keymap, 3);
+ ED_keymap_proportional_cycle(keyconf, keymap);
+ ED_keymap_proportional_editmode(keyconf, keymap, TRUE);
}
Modified: branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
2012-05-30 08:02:49 UTC (rev 47210)
+++ branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
2012-05-30 08:04:06 UTC (rev 47211)
@@ -88,14 +88,10 @@
void ED_object_parent_clear(struct Object *ob, int type);
struct Base *ED_object_scene_link(struct Scene *scene, struct Object *ob);
-/* generic editmode keys like pet
- * do_pet
- * 0: No
- * 1: Object
- * 2: Edit
- * 3: Edit with connected
- * */
-void ED_object_generic_keymap(struct wmKeyConfig *keyconf, struct wmKeyMap
*keymap, int do_pet);
+void ED_keymap_proportional_cycle(struct wmKeyConfig *keyconf, struct wmKeyMap
*keymap);
+void ED_keymap_proportional_obmode(struct wmKeyConfig *keyconf, struct
wmKeyMap *keymap);
+void ED_keymap_proportional_editmode(struct wmKeyConfig *keyconf, struct
wmKeyMap *keymap,
+ const short do_connected);
/* send your own notifier for select! */
void ED_base_object_select(struct Base *base, short mode);
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-47201
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-47210
Modified: branches/soc-2011-tomato/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mesh/mesh_ops.c
2012-05-30 08:02:49 UTC (rev 47210)
+++ branches/soc-2011-tomato/source/blender/editors/mesh/mesh_ops.c
2012-05-30 08:04:06 UTC (rev 47211)
@@ -376,7 +376,9 @@
RNA_int_set(kmi->ptr, "level", i);
}
- ED_object_generic_keymap(keyconf, keymap, 3);
+ ED_keymap_proportional_cycle(keyconf, keymap);
+ ED_keymap_proportional_editmode(keyconf, keymap, TRUE);
+
knifetool_modal_keymap(keyconf);
}
Modified: branches/soc-2011-tomato/source/blender/editors/metaball/mball_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/metaball/mball_ops.c
2012-05-30 08:02:49 UTC (rev 47210)
+++ branches/soc-2011-tomato/source/blender/editors/metaball/mball_ops.c
2012-05-30 08:04:06 UTC (rev 47211)
@@ -79,6 +79,7 @@
kmi = WM_keymap_add_item(keymap, "MBALL_OT_select_all", IKEY, KM_PRESS,
KM_CTRL, 0);
RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
- ED_object_generic_keymap(keyconf, keymap, 3);
+ ED_keymap_proportional_cycle(keyconf, keymap);
+ ED_keymap_proportional_editmode(keyconf, keymap, TRUE);
}
Modified: branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
2012-05-30 08:02:49 UTC (rev 47210)
+++ branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
2012-05-30 08:04:06 UTC (rev 47211)
@@ -197,6 +197,9 @@
if (!(base->flag & SELECT)) {
base->object->restrictflag |= OB_RESTRICT_VIEW;
changed = 1;
+ if (base == BASACT) {
+ ED_base_object_activate(C, NULL);
+ }
}
}
}
Modified: branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
2012-05-30 08:02:49 UTC (rev 47210)
+++ branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
2012-05-30 08:04:06 UTC (rev 47211)
@@ -297,7 +297,8 @@
keymap->poll = object_mode_poll;
/* object mode supports PET now */
- ED_object_generic_keymap(keyconf, keymap, 1);
+ ED_keymap_proportional_cycle(keyconf, keymap);
+ ED_keymap_proportional_obmode(keyconf, keymap);
WM_keymap_add_item(keymap, "VIEW3D_OT_game_start", PKEY, KM_PRESS, 0,
0);
@@ -420,41 +421,41 @@
/* menus */
WM_keymap_add_menu(keymap, "VIEW3D_MT_hook", HKEY, KM_PRESS, KM_CTRL,
0);
- ED_object_generic_keymap(keyconf, keymap, 2);
+ ED_keymap_proportional_cycle(keyconf, keymap);
+ ED_keymap_proportional_editmode(keyconf, keymap, FALSE);
}
-void ED_object_generic_keymap(struct wmKeyConfig *UNUSED(keyconf), struct
wmKeyMap *keymap, int do_pet)
+void ED_keymap_proportional_cycle(struct wmKeyConfig *UNUSED(keyconf), struct
wmKeyMap *keymap)
{
wmKeyMapItem *kmi;
- /* used by mesh, curve & lattice only */
- if (do_pet) {
- /* context ops */
- kmi = WM_keymap_add_item(keymap, "WM_OT_context_cycle_enum",
OKEY, KM_PRESS, KM_SHIFT, 0);
- RNA_string_set(kmi->ptr, "data_path",
"tool_settings.proportional_edit_falloff");
+ kmi = WM_keymap_add_item(keymap, "WM_OT_context_cycle_enum", OKEY,
KM_PRESS, KM_SHIFT, 0);
+ RNA_string_set(kmi->ptr, "data_path",
"tool_settings.proportional_edit_falloff");
+}
- // Object mode
- if (do_pet == TRUE) {
+void ED_keymap_proportional_obmode(struct wmKeyConfig *UNUSED(keyconf), struct
wmKeyMap *keymap)
+{
+ wmKeyMapItem *kmi;
- kmi = WM_keymap_add_item(keymap,
"WM_OT_context_toggle", OKEY, KM_PRESS, 0, 0);
- RNA_string_set(kmi->ptr, "data_path",
"tool_settings.use_proportional_edit_objects");
+ kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", OKEY,
KM_PRESS, 0, 0);
+ RNA_string_set(kmi->ptr, "data_path",
"tool_settings.use_proportional_edit_objects");
+}
- }
- else { // Edit mode
+void ED_keymap_proportional_editmode(struct wmKeyConfig *UNUSED(keyconf),
struct wmKeyMap *keymap,
+ const short do_connected)
+{
+ wmKeyMapItem *kmi;
- kmi = WM_keymap_add_item(keymap,
"WM_OT_context_toggle_enum", OKEY, KM_PRESS, 0, 0);
- RNA_string_set(kmi->ptr, "data_path",
"tool_settings.proportional_edit");
- RNA_string_set(kmi->ptr, "value_1", "DISABLED");
- RNA_string_set(kmi->ptr, "value_2", "ENABLED");
+ kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", OKEY,
KM_PRESS, 0, 0);
+ RNA_string_set(kmi->ptr, "data_path",
"tool_settings.proportional_edit");
+ RNA_string_set(kmi->ptr, "value_1", "DISABLED");
+ RNA_string_set(kmi->ptr, "value_2", "ENABLED");
- /* for modes/object types that allow 'connected' mode,
add the Alt O key */
- if (do_pet == 3) {
- kmi = WM_keymap_add_item(keymap,
"WM_OT_context_toggle_enum", OKEY, KM_PRESS, KM_ALT, 0);
- RNA_string_set(kmi->ptr, "data_path",
"tool_settings.proportional_edit");
- RNA_string_set(kmi->ptr, "value_1", "DISABLED");
- RNA_string_set(kmi->ptr, "value_2",
"CONNECTED");
- }
- }
+ /* for modes/object types that allow 'connected' mode, add the Alt O
key */
+ if (do_connected) {
+ kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum",
OKEY, KM_PRESS, KM_ALT, 0);
+ RNA_string_set(kmi->ptr, "data_path",
"tool_settings.proportional_edit");
+ RNA_string_set(kmi->ptr, "value_1", "DISABLED");
+ RNA_string_set(kmi->ptr, "value_2", "CONNECTED");
}
}
-
Modified: branches/soc-2011-tomato/source/blender/editors/physics/physics_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/physics/physics_ops.c
2012-05-30 08:02:49 UTC (rev 47210)
+++ branches/soc-2011-tomato/source/blender/editors/physics/physics_ops.c
2012-05-30 08:04:06 UTC (rev 47211)
@@ -136,7 +136,8 @@
WM_keymap_add_item(keymap, "PARTICLE_OT_weight_set", KKEY, KM_PRESS,
KM_SHIFT, 0);
- ED_object_generic_keymap(keyconf, keymap, 2);
+ ED_keymap_proportional_cycle(keyconf, keymap);
+ ED_keymap_proportional_editmode(keyconf, keymap, FALSE);
}
/******************************* boids *************************************/
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
