[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47709] trunk/blender/source/blender/ editors/space_outliner: OUTLINER_OT_material_drop -- Drag & Drop materials onto objects in the outliner

[Dan Eicher]

Revision: 47709
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47709
Author:   dna
Date:     2012-06-10 22:22:26 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
OUTLINER_OT_material_drop -- Drag & Drop materials onto objects in the outliner

Adds the material at materials + 1 unlike the DnD view3d one which replaces the first one

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
    trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
    trunk/blender/source/blender/editors/space_outliner/outliner_ops.c
    trunk/blender/source/blender/editors/space_outliner/space_outliner.c

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_edit.c	2012-06-10 22:13:17 UTC (rev 47708)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_edit.c	2012-06-10 22:22:26 UTC (rev 47709)
@@ -35,6 +35,7 @@
 #include "DNA_group_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
+#include "DNA_material_types.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
@@ -48,6 +49,7 @@
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
+#include "BKE_material.h"
 
 #include "ED_object.h"
 #include "ED_screen.h"
@@ -1816,3 +1818,68 @@
 	RNA_def_string(ot->srna, "object", "Object", MAX_ID_NAME, "Object", "Target Object");
 	RNA_def_string(ot->srna, "scene", "Scene", MAX_ID_NAME, "Scene", "Target Scene");
 }
+
+static int material_drop_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	Main *bmain = CTX_data_main(C);
+	Material *ma = NULL;
+	Object *ob = NULL;
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	ARegion *ar = CTX_wm_region(C);
+	TreeElement *te = NULL;
+	TreeElement *te_found = NULL;
+	char mat_name[MAX_ID_NAME - 2];
+	float fmval[2];
+
+	UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]);
+
+	/* Find object hovered over */
+	for (te = soops->tree.first; te; te = te->next) {
+		te_found = outliner_dropzone_parent(C, event, te, fmval);
+		if (te_found)
+			break;
+	}
+
+	if (te_found) {
+		RNA_string_set(op->ptr, "object", te_found->name);
+		ob = (Object *)BKE_libblock_find_name(ID_OB, te_found->name);
+
+		RNA_string_get(op->ptr, "material", mat_name);
+		ma = (Material *)BKE_libblock_find_name(ID_MA, mat_name);
+
+		if (ELEM(NULL, ob, ma)) {
+			return OPERATOR_CANCELLED;
+		}
+
+		assign_material(ob, ma, ob->totcol + 1);
+
+		DAG_ids_flush_update(bmain, 0);
+		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));		
+		WM_event_add_notifier(C, NC_MATERIAL | ND_SHADING, ma);
+
+		return OPERATOR_FINISHED;
+	}
+
+	return OPERATOR_CANCELLED;
+}
+
+void OUTLINER_OT_material_drop(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Drop Material on Object";
+	ot->description = "Drag material to object in Outliner";
+	ot->idname = "OUTLINER_OT_material_drop";
+
+	/* api callbacks */
+	ot->invoke = material_drop_invoke;
+
+	ot->poll = ED_operator_outliner_active;
+
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_string(ot->srna, "object", "Object", MAX_ID_NAME, "Object", "Target Object");
+	RNA_def_string(ot->srna, "material", "Material", MAX_ID_NAME, "Material", "Target Material");
+}
+

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_intern.h	2012-06-10 22:13:17 UTC (rev 47708)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_intern.h	2012-06-10 22:22:26 UTC (rev 47709)
@@ -221,6 +221,7 @@
 void OUTLINER_OT_parent_drop(struct wmOperatorType *ot);
 void OUTLINER_OT_parent_clear(struct wmOperatorType *ot);
 void OUTLINER_OT_scene_drop(struct wmOperatorType *ot);
+void OUTLINER_OT_material_drop(struct wmOperatorType *ot);
 
 /* outliner_tools.c ---------------------------------------------- */
 

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_ops.c	2012-06-10 22:13:17 UTC (rev 47708)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_ops.c	2012-06-10 22:22:26 UTC (rev 47709)
@@ -77,6 +77,7 @@
 	WM_operatortype_append(OUTLINER_OT_parent_drop);
 	WM_operatortype_append(OUTLINER_OT_parent_clear);
 	WM_operatortype_append(OUTLINER_OT_scene_drop);
+	WM_operatortype_append(OUTLINER_OT_material_drop);
 }
 
 void outliner_keymap(wmKeyConfig *keyconf)

Modified: trunk/blender/source/blender/editors/space_outliner/space_outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/space_outliner.c	2012-06-10 22:13:17 UTC (rev 47708)
+++ trunk/blender/source/blender/editors/space_outliner/space_outliner.c	2012-06-10 22:22:26 UTC (rev 47709)
@@ -194,6 +194,35 @@
 	RNA_string_set(drop->ptr, "object", id->name + 2);
 }
 
+static int outliner_material_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
+{
+	ARegion *ar = CTX_wm_region(C);
+	SpaceOops *soops = CTX_wm_space_outliner(C);
+	TreeElement *te = NULL;
+	float fmval[2];
+	UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]);
+
+	if (drag->type == WM_DRAG_ID) {
+		ID *id = (ID *)drag->poin;
+		if (GS(id->name) == ID_MA) {
+			/* Ensure item under cursor is valid drop target */
+			/* Find object hovered over */
+			for (te = soops->tree.first; te; te = te->next) {
+				if (outliner_dropzone_parent(C, event, te, fmval))
+					return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+static void outliner_material_drop_copy(wmDrag *drag, wmDropBox *drop)
+{
+	ID *id = (ID *)drag->poin;
+
+	RNA_string_set(drop->ptr, "material", id->name + 2);
+}
+
 /* region dropbox definition */
 static void outliner_dropboxes(void)
 {
@@ -202,6 +231,7 @@
 	WM_dropbox_add(lb, "OUTLINER_OT_parent_drop", outliner_parent_drop_poll, outliner_parent_drop_copy);
 	WM_dropbox_add(lb, "OUTLINER_OT_parent_clear", outliner_parent_clear_poll, outliner_parent_clear_copy);
 	WM_dropbox_add(lb, "OUTLINER_OT_scene_drop", outliner_scene_drop_poll, outliner_scene_drop_copy);
+	WM_dropbox_add(lb, "OUTLINER_OT_material_drop", outliner_material_drop_poll, outliner_material_drop_copy);
 }
 
 static void outliner_main_area_draw(const bContext *C, ARegion *ar)