[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47212] branches/soc-2011-tomato/source/ blender/editors: proportional editing keys now work when editing masks.

[Campbell Barton]

Revision: 47212
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47212
Author:   campbellbarton
Date:     2012-05-30 08:20:20 +0000 (Wed, 30 May 2012)
Log Message:
-----------
proportional editing keys now work when editing masks.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
    branches/soc-2011-tomato/source/blender/editors/mask/mask_editor.c
    branches/soc-2011-tomato/source/blender/editors/object/object_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c

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:04:06 UTC (rev 47211)
+++ branches/soc-2011-tomato/source/blender/editors/include/ED_object.h	2012-05-30 08:20:20 UTC (rev 47212)
@@ -90,6 +90,7 @@
 
 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_maskmode(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap);
 void ED_keymap_proportional_editmode(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap,
                                      const short do_connected);
 

Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_editor.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_editor.c	2012-05-30 08:04:06 UTC (rev 47211)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_editor.c	2012-05-30 08:20:20 UTC (rev 47212)
@@ -42,6 +42,7 @@
 
 #include "ED_screen.h"
 #include "ED_mask.h"
+#include "ED_object.h" /* ED_keymap_proportional_maskmode only */
 #include "ED_clip.h"
 #include "ED_transform.h"
 
@@ -232,6 +233,10 @@
 
 	WM_keymap_add_item(keymap, "MASK_OT_new", NKEY, KM_PRESS, KM_ALT, 0);
 
+	/* mask mode supports PET now */
+	ED_keymap_proportional_cycle(keyconf, keymap);
+	ED_keymap_proportional_maskmode(keyconf, keymap);
+
 	/* geometry */
 	WM_keymap_add_item(keymap, "MASK_OT_add_vertex_slide", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "MASK_OT_add_feather_vertex_slide", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);

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:04:06 UTC (rev 47211)
+++ branches/soc-2011-tomato/source/blender/editors/object/object_ops.c	2012-05-30 08:20:20 UTC (rev 47212)
@@ -441,6 +441,14 @@
 	RNA_string_set(kmi->ptr, "data_path", "tool_settings.use_proportional_edit_objects");
 }
 
+void ED_keymap_proportional_maskmode(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_mask");
+}
+
 void ED_keymap_proportional_editmode(struct wmKeyConfig *UNUSED(keyconf), struct wmKeyMap *keymap,
                                      const short do_connected)
 {

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c	2012-05-30 08:04:06 UTC (rev 47211)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c	2012-05-30 08:20:20 UTC (rev 47212)
@@ -1317,6 +1317,26 @@
 	ED_region_header(C, ar);
 }
 
+static void clip_header_area_listener(ARegion *ar, wmNotifier *wmn)
+{
+	/* context changes */
+	switch (wmn->category) {
+		case NC_SCENE:
+			switch (wmn->data) {
+				/* for proportional editmode only */
+				case ND_TOOLSETTINGS:
+					/* TODO - should do this when in mask mode only but no datas available */
+					// if(sc->mode == SC_MODE_MASKEDITING)
+					{
+						ED_region_tag_redraw(ar);
+					}
+					break;
+			}
+			break;
+	}
+}
+
+
 /****************** tools region ******************/
 
 /* add handlers, stuff you only do once or on area/region changes */
@@ -1478,6 +1498,7 @@
 
 	art->init = clip_header_area_init;
 	art->draw = clip_header_area_draw;
+	art->listener = clip_header_area_listener;
 
 	BLI_addhead(&st->regiontypes, art);