[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26341] trunk/blender/source/blender/ editors: Two small dragdrop fixes:

[Ton Roosendaal]

Revision: 26341
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26341
Author:   ton
Date:     2010-01-27 16:08:30 +0100 (Wed, 27 Jan 2010)

Log Message:
-----------
Two small dragdrop fixes:

- drop material didn't send correct notifiers to refresh view
- drop material gave error print

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_relations.c
    trunk/blender/source/blender/editors/space_view3d/space_view3d.c

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c      
2010-01-27 14:13:01 UTC (rev 26340)
+++ trunk/blender/source/blender/editors/object/object_relations.c      
2010-01-27 15:08:30 UTC (rev 26341)
@@ -1842,7 +1842,9 @@
        
        assign_material(base->object, ma, 1);
        
-       WM_event_add_notifier(C, NC_OBJECT|ND_SHADING, base->object);
+       DAG_ids_flush_update(0);
+       WM_event_add_notifier(C, NC_SPACE|ND_SPACE_VIEW3D, CTX_wm_view3d(C));
+       
        return OPERATOR_FINISHED;
 }
 

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c    
2010-01-27 14:13:01 UTC (rev 26340)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c    
2010-01-27 15:08:30 UTC (rev 26341)
@@ -425,7 +425,7 @@
        return 0;
 }
 
-static void view3d_id_drop_copy(wmDrag *drag, wmDropBox *drop)
+static void view3d_ob_drop_copy(wmDrag *drag, wmDropBox *drop)
 {
        ID *id= (ID *)drag->poin;
        PointerRNA ptr;
@@ -438,12 +438,20 @@
                RNA_string_set(drop->ptr, "name", id->name+2);
 }
 
+static void view3d_id_drop_copy(wmDrag *drag, wmDropBox *drop)
+{
+       ID *id= (ID *)drag->poin;
+
+       RNA_string_set(drop->ptr, "name", id->name+2);
+}
+
+
 /* region dropbox definition */
 static void view3d_dropboxes(void)
 {
        ListBase *lb= WM_dropboxmap_find("View3D", SPACE_VIEW3D, 
RGN_TYPE_WINDOW);
        
-       WM_dropbox_add(lb, "OBJECT_OT_add_named_cursor", view3d_ob_drop_poll, 
view3d_id_drop_copy);
+       WM_dropbox_add(lb, "OBJECT_OT_add_named_cursor", view3d_ob_drop_poll, 
view3d_ob_drop_copy);
        WM_dropbox_add(lb, "OBJECT_OT_drop_named_material", 
view3d_mat_drop_poll, view3d_id_drop_copy);
        WM_dropbox_add(lb, "MESH_OT_drop_named_image", view3d_ima_drop_poll, 
view3d_id_drop_copy);
 }


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs