Fix #21470: changing brush settings redraws the 3d view unecessarily,
[blender-staging.git] / source / blender / editors / space_view3d / space_view3d.c
index fe3ec2a5e50a44619ac8748f0364d55094e579ca..92e3b35f6145a17e8d9bc9b723e5c05480662132 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * $Id:
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Original Code is Copyright (C) 2008 Blender Foundation.
  * All rights reserved.
 #include <string.h>
 #include <stdio.h>
 
-#include "DNA_action_types.h"
-#include "DNA_armature_types.h"
 #include "DNA_object_types.h"
-#include "DNA_space_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_view3d_types.h"
 
 #include "MEM_guardedalloc.h"
 
 #include "BKE_global.h"
 #include "BKE_screen.h"
 #include "BKE_utildefines.h"
+#include "BKE_image.h"
 
-#include "ED_armature.h"
-#include "ED_space_api.h"
 #include "ED_screen.h"
 #include "ED_object.h"
 
 #include "BIF_gl.h"
 
+
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "UI_interface.h"
-#include "UI_resources.h"
-#include "UI_view2d.h"
 
 #include "RNA_access.h"
 
+#include "UI_resources.h"
+
 #include "view3d_intern.h"     // own include
 
 /* ******************** manage regions ********************* */
@@ -171,10 +165,14 @@ RegionView3D *ED_view3d_context_rv3d(bContext *C)
  */
 void ED_view3d_init_mats_rv3d(struct Object *ob, struct RegionView3D *rv3d)
 {
-       wmMultMatrix(ob->obmat);
        /* local viewmat and persmat, to calculate projections */
-       wmGetMatrix(rv3d->viewmatob);
-       wmGetSingleMatrix(rv3d->persmatob);
+       mul_m4_m4m4(rv3d->viewmatob, ob->obmat, rv3d->viewmat);
+       mul_m4_m4m4(rv3d->persmatob, ob->obmat, rv3d->persmat);
+
+       /* we have to multiply instead of loading viewmatob to make
+          it work with duplis using displists, otherwise it will
+          override the dupli-matrix */
+       glMultMatrixf(ob->obmat);
 
        /* initializes object space clipping, speeds up clip tests */
        ED_view3d_local_clipping(rv3d, ob->obmat);
@@ -225,7 +223,7 @@ static SpaceLink *view3d_new(const bContext *C)
        ar= MEM_callocN(sizeof(ARegion), "toolshelf for view3d");
        
        BLI_addtail(&v3d->regionbase, ar);
-       ar->regiontype= RGN_TYPE_UI;
+       ar->regiontype= RGN_TYPE_TOOLS;
        ar->alignment= RGN_ALIGN_LEFT;
        ar->flag = RGN_FLAG_HIDDEN;
        
@@ -233,7 +231,7 @@ static SpaceLink *view3d_new(const bContext *C)
        ar= MEM_callocN(sizeof(ARegion), "tool properties for view3d");
        
        BLI_addtail(&v3d->regionbase, ar);
-       ar->regiontype= RGN_TYPE_UI;
+       ar->regiontype= RGN_TYPE_TOOL_PROPS;
        ar->alignment= RGN_ALIGN_BOTTOM|RGN_SPLIT_PREV;
        ar->flag = RGN_FLAG_HIDDEN;
        
@@ -265,12 +263,13 @@ static SpaceLink *view3d_new(const bContext *C)
 static void view3d_free(SpaceLink *sl)
 {
        View3D *vd= (View3D *) sl;
-       
-       if(vd->bgpic) {
-               if(vd->bgpic->ima) vd->bgpic->ima->id.us--;
-               MEM_freeN(vd->bgpic);
+
+       BGpic *bgpic;
+       for(bgpic= vd->bgpicbase.first; bgpic; bgpic= bgpic->next) {
+               if(bgpic->ima) bgpic->ima->id.us--;
        }
-       
+       BLI_freelistN(&vd->bgpicbase);
+
        if(vd->localvd) MEM_freeN(vd->localvd);
        
        if(vd->properties_storage) MEM_freeN(vd->properties_storage);
@@ -288,6 +287,7 @@ static SpaceLink *view3d_duplicate(SpaceLink *sl)
 {
        View3D *v3do= (View3D *)sl;
        View3D *v3dn= MEM_dupallocN(sl);
+       BGpic *bgpic;
        
        /* clear or remove stuff from old */
        
@@ -302,10 +302,11 @@ static SpaceLink *view3d_duplicate(SpaceLink *sl)
        
        /* copy or clear inside new stuff */
 
-       if(v3dn->bgpic) {
-               v3dn->bgpic= MEM_dupallocN(v3dn->bgpic);
-               if(v3dn->bgpic->ima) v3dn->bgpic->ima->id.us++;
-       }
+       BLI_duplicatelist(&v3dn->bgpicbase, &v3do->bgpicbase);
+       for(bgpic= v3dn->bgpicbase.first; bgpic; bgpic= bgpic->next)
+               if(bgpic->ima)
+                       bgpic->ima->id.us++;
+
        v3dn->properties_storage= NULL;
        
        return (SpaceLink *)v3dn;
@@ -314,6 +315,7 @@ static SpaceLink *view3d_duplicate(SpaceLink *sl)
 /* add handlers, stuff you only do once or on area/region changes */
 static void view3d_main_area_init(wmWindowManager *wm, ARegion *ar)
 {
+       ListBase *lb;
        wmKeyMap *keymap;
 
        /* object ops. */
@@ -381,8 +383,93 @@ static void view3d_main_area_init(wmWindowManager *wm, ARegion *ar)
 
        keymap= WM_keymap_find(wm->defaultconf, "3D View", SPACE_VIEW3D, 0);
        WM_event_add_keymap_handler(&ar->handlers, keymap);
+       
+       /* add drop boxes */
+       lb= WM_dropboxmap_find("View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW);
+       
+       WM_event_add_dropbox_handler(&ar->handlers, lb);
+       
+}
+
+static int view3d_ob_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
+{
+       if(drag->type==WM_DRAG_ID) {
+               ID *id= (ID *)drag->poin;
+               if( GS(id->name)==ID_OB )
+                       return 1;
+       }
+       return 0;
+}
+
+static int view3d_mat_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
+{
+       if(drag->type==WM_DRAG_ID) {
+               ID *id= (ID *)drag->poin;
+               if( GS(id->name)==ID_MA )
+                       return 1;
+       }
+       return 0;
 }
 
+static int view3d_ima_drop_poll(bContext *C, wmDrag *drag, wmEvent *event)
+{
+       if( ED_view3d_give_base_under_cursor(C, event->mval) ) {
+               if(drag->type==WM_DRAG_ID) {
+                       ID *id= (ID *)drag->poin;
+                       if( GS(id->name)==ID_IM )
+                               return 1;
+               }
+               else if(drag->type==WM_DRAG_PATH){
+                       if(ELEM(drag->icon, 0, ICON_FILE_IMAGE))        /* rule might not work? */
+                               return 1;
+               }
+       }
+       return 0;
+}
+
+static void view3d_ob_drop_copy(wmDrag *drag, wmDropBox *drop)
+{
+       ID *id= (ID *)drag->poin;
+       PointerRNA ptr;
+
+       /* need to put name in sub-operator in macro */
+       ptr= RNA_pointer_get(drop->ptr, "OBJECT_OT_add_named");
+       if(ptr.data)
+               RNA_string_set(&ptr, "name", id->name+2);
+       else
+               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);
+}
+
+static void view3d_id_path_drop_copy(wmDrag *drag, wmDropBox *drop)
+{
+       ID *id= (ID *)drag->poin;
+       
+       if(id)
+               RNA_string_set(drop->ptr, "name", id->name+2);
+       if(drag->path[0]) 
+               RNA_string_set(drop->ptr, "filepath", drag->path);
+}
+
+
+/* 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_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_path_drop_copy);
+}
+
+
+
 /* type callback, not region itself */
 static void view3d_main_area_free(ARegion *ar)
 {
@@ -436,19 +523,25 @@ static void view3d_main_area_listener(ARegion *ar, wmNotifier *wmn)
        switch(wmn->category) {
                case NC_ANIMATION:
                        switch(wmn->data) {
-                               case ND_KEYFRAME_EDIT:
                                case ND_KEYFRAME_PROP:
-                               case ND_NLA_EDIT:
                                case ND_NLA_ACTCHANGE:
-                               case ND_ANIMCHAN_SELECT:
                                        ED_region_tag_redraw(ar);
                                        break;
+                               case ND_NLA:
+                               case ND_KEYFRAME:
+                                       if (wmn->action == NA_EDITED)
+                                               ED_region_tag_redraw(ar);
+                                       break;
+                               case ND_ANIMCHAN:
+                                       if (wmn->action == NA_SELECTED)
+                                               ED_region_tag_redraw(ar);
+                                       break;
                        }
                        break;
                case NC_SCENE:
                        switch(wmn->data) {
-                               case ND_TRANSFORM:
                                case ND_FRAME:
+                               case ND_TRANSFORM:
                                case ND_OB_ACTIVE:
                                case ND_OB_SELECT:
                                case ND_LAYER:
@@ -470,8 +563,7 @@ static void view3d_main_area_listener(ARegion *ar, wmNotifier *wmn)
                                case ND_MODIFIER:
                                case ND_CONSTRAINT:
                                case ND_KEYS:
-                               case ND_PARTICLE_SELECT:
-                               case ND_PARTICLE_DATA:
+                               case ND_PARTICLE:
                                        ED_region_tag_redraw(ar);
                                        break;
                        }
@@ -495,7 +587,7 @@ static void view3d_main_area_listener(ARegion *ar, wmNotifier *wmn)
                        break;
                case NC_BRUSH:
                        if(wmn->action == NA_EDITED)
-                               ED_region_tag_redraw(ar);
+                               ED_region_tag_redraw_overlay(ar);
                        break;                  
                case NC_MATERIAL:
                        switch(wmn->data) {
@@ -523,14 +615,29 @@ static void view3d_main_area_listener(ARegion *ar, wmNotifier *wmn)
                         * more context than just the region */
                        ED_region_tag_redraw(ar);
                        break;
+               case NC_TEXTURE:        
+                       /* same as above */
+                       ED_region_tag_redraw(ar);
+                       break;
                case NC_SPACE:
-                       if(wmn->data == ND_SPACE_VIEW3D)
+                       if(wmn->data == ND_SPACE_VIEW3D) {
+                               if (wmn->subtype == NS_VIEW3D_GPU) {
+                                       RegionView3D *rv3d= ar->regiondata;
+                                       rv3d->rflag |= RV3D_GPULIGHT_UPDATE;
+                               }
                                ED_region_tag_redraw(ar);
+                       }
                        break;
                case NC_ID:
                        if(wmn->action == NA_RENAME)
                                ED_region_tag_redraw(ar);
                        break;
+               case NC_SCREEN:
+                       if(wmn->data == ND_GPENCIL)     
+                               ED_region_tag_redraw(ar);
+                       else if(wmn->data==ND_ANIMPLAY)
+                               ED_region_tag_redraw(ar);
+                       break;
        }
 }
 
@@ -607,12 +714,15 @@ static void view3d_buttons_area_listener(ARegion *ar, wmNotifier *wmn)
        switch(wmn->category) {
                case NC_ANIMATION:
                        switch(wmn->data) {
-                               case ND_KEYFRAME_EDIT:
                                case ND_KEYFRAME_PROP:
-                               case ND_NLA_EDIT:
                                case ND_NLA_ACTCHANGE:
                                        ED_region_tag_redraw(ar);
                                        break;
+                               case ND_NLA:
+                               case ND_KEYFRAME:
+                                       if (wmn->action == NA_EDITED)
+                                               ED_region_tag_redraw(ar);
+                                       break;  
                        }
                        break;
                case NC_SCENE:
@@ -625,6 +735,11 @@ static void view3d_buttons_area_listener(ARegion *ar, wmNotifier *wmn)
                                        ED_region_tag_redraw(ar);
                                        break;
                        }
+                       switch(wmn->action) {
+                               case NA_EDITED:
+                                       ED_region_tag_redraw(ar);
+                                       break;
+                       }
                        break;
                case NC_OBJECT:
                        switch(wmn->data) {
@@ -662,6 +777,10 @@ static void view3d_buttons_area_listener(ARegion *ar, wmNotifier *wmn)
                        if(wmn->action == NA_RENAME)
                                ED_region_tag_redraw(ar);
                        break;
+               case NC_SCREEN: 
+                       if(wmn->data == ND_GPENCIL)
+                               ED_region_tag_redraw(ar);
+                       break;
        }
 }
 
@@ -681,6 +800,25 @@ static void view3d_tools_area_draw(const bContext *C, ARegion *ar)
        ED_region_panels(C, ar, 1, CTX_data_mode_string(C), -1);
 }
 
+static void view3d_props_area_listener(ARegion *ar, wmNotifier *wmn)
+{
+       /* context changes */
+       switch(wmn->category) {
+               case NC_WM:
+                       if(wmn->data == ND_HISTORY)
+                               ED_region_tag_redraw(ar);
+                       break;
+               case NC_SCENE:
+                       if(wmn->data == ND_MODE)
+                               ED_region_tag_redraw(ar);
+                       break;
+               case NC_SPACE:
+                       if(wmn->data == ND_SPACE_VIEW3D)
+                               ED_region_tag_redraw(ar);
+                       break;
+       }
+}
+
 static int view3d_context(const bContext *C, const char *member, bContextDataResult *result)
 {
        View3D *v3d= CTX_wm_view3d(C);
@@ -709,7 +847,7 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes
                                }
                        }
                }
-
+               CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
                return 1;
        }
        else if(CTX_data_equals(member, "selected_editable_objects") || CTX_data_equals(member, "selected_editable_bases")) {
@@ -727,7 +865,7 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes
                                }
                        }
                }
-               
+               CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
                return 1;
        }
        else if(CTX_data_equals(member, "visible_objects") || CTX_data_equals(member, "visible_bases")) {
@@ -743,7 +881,7 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes
                                }
                        }
                }
-               
+               CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
                return 1;
        }
        else if(CTX_data_equals(member, "selectable_objects") || CTX_data_equals(member, "selectable_bases")) {
@@ -759,7 +897,7 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes
                                }
                        }
                }
-               
+               CTX_data_type_set(result, CTX_DATA_TYPE_COLLECTION);
                return 1;
        }
        else if(CTX_data_equals(member, "active_base")) {
@@ -783,6 +921,24 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes
        return -1; /* found but not available */
 }
 
+/*area (not region) level listener*/
+#if 0 // removed since BKE_image_user_calc_frame is now called in draw_bgpic because screen_ops doesnt call the notifier.
+void space_view3d_listener(struct ScrArea *area, struct wmNotifier *wmn)
+{
+       if (wmn->category == NC_SCENE && wmn->data == ND_FRAME) {
+               View3D *v3d = area->spacedata.first;
+               BGpic *bgpic = v3d->bgpicbase.first;
+
+               for (; bgpic; bgpic = bgpic->next) {
+                       if (bgpic->ima) {
+                               Scene *scene = wmn->reference;
+                               BKE_image_user_calc_frame(&bgpic->iuser, scene->r.cfra, 0);
+                       }
+               }
+       }
+}
+#endif
+
 /* only called once, from space/spacetypes.c */
 void ED_spacetype_view3d(void)
 {
@@ -795,9 +951,11 @@ void ED_spacetype_view3d(void)
        st->new= view3d_new;
        st->free= view3d_free;
        st->init= view3d_init;
+//     st->listener = space_view3d_listener;
        st->duplicate= view3d_duplicate;
        st->operatortypes= view3d_operatortypes;
        st->keymap= view3d_keymap;
+       st->dropboxes= view3d_dropboxes;
        st->context= view3d_context;
        
        /* regions: main window */
@@ -815,7 +973,7 @@ void ED_spacetype_view3d(void)
        /* regions: listview/buttons */
        art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region");
        art->regionid = RGN_TYPE_UI;
-       art->minsizex= 180; // XXX
+       art->prefsizex= 180; // XXX
        art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_FRAMES;
        art->listener= view3d_buttons_area_listener;
        art->init= view3d_buttons_area_init;
@@ -827,8 +985,8 @@ void ED_spacetype_view3d(void)
        /* regions: tool(bar) */
        art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region");
        art->regionid = RGN_TYPE_TOOLS;
-       art->minsizex= 160; // XXX
-       art->minsizey= 50; // XXX
+       art->prefsizex= 160; // XXX
+       art->prefsizey= 50; // XXX
        art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_FRAMES;
        art->listener= view3d_buttons_area_listener;
        art->init= view3d_tools_area_init;
@@ -840,10 +998,10 @@ void ED_spacetype_view3d(void)
        /* regions: tool properties */
        art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region");
        art->regionid = RGN_TYPE_TOOL_PROPS;
-       art->minsizex= 0;
-       art->minsizey= 120;
+       art->prefsizex= 0;
+       art->prefsizey= 120;
        art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_FRAMES;
-       art->listener= view3d_buttons_area_listener;
+       art->listener= view3d_props_area_listener;
        art->init= view3d_tools_area_init;
        art->draw= view3d_tools_area_draw;
        BLI_addhead(&st->regiontypes, art);
@@ -854,7 +1012,7 @@ void ED_spacetype_view3d(void)
        /* regions: header */
        art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region");
        art->regionid = RGN_TYPE_HEADER;
-       art->minsizey= HEADERY;
+       art->prefsizey= HEADERY;
        art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D|ED_KEYMAP_FRAMES|ED_KEYMAP_HEADER;
        art->listener= view3d_header_area_listener;
        art->init= view3d_header_area_init;