[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18504] branches/blender2.5/blender/source /blender/editors: 2.5

[Ton Roosendaal]

Revision: 18504
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18504
Author:   ton
Date:     2009-01-14 17:54:36 +0100 (Wed, 14 Jan 2009)

Log Message:
-----------
2.5

Bugfix;
- do not set active base/object yourse, but use ED_base_object_activate
- view3d buttons was reading NULL pointer.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/object/object_edit.c
    
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c

Modified: 
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c     
2009-01-14 16:40:11 UTC (rev 18503)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c     
2009-01-14 16:54:36 UTC (rev 18504)
@@ -1620,9 +1620,8 @@
 static int object_set_restrictview_exec(bContext *C, wmOperator *op)
 {
        Scene *scene= CTX_data_scene(C);
+       short changed = 0;
        
-       short changed = 0, changed_act = 0;
-       
        CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
                if(RNA_enum_is_equal(op->ptr, "type", "SELECTED")){
                        if (base->flag & SELECT){
@@ -1631,8 +1630,7 @@
                                base->object->restrictflag |= OB_RESTRICT_VIEW;
                                changed = 1;
                                if (base==BASACT) {
-                                       BASACT= NULL;
-                                       changed_act = 1;
+                                       ED_base_object_activate(C, NULL);
                                }
                        }
                }
@@ -1652,9 +1650,6 @@
                
                WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, 
CTX_data_scene(C));
                
-               if (changed_act) { /* these spaces depend on the active object 
*/
-                       WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, 
CTX_data_scene(C));
-               }
        }
 
        return OPERATOR_FINISHED;

Modified: 
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- 
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c 
    2009-01-14 16:40:11 UTC (rev 18503)
+++ 
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c 
    2009-01-14 16:54:36 UTC (rev 18504)
@@ -5327,8 +5327,8 @@
        Scene *scene= CTX_data_scene(C);
        ScrArea *sa= CTX_wm_area(C);
        View3D *v3d= sa->spacedata.first;
-       Base *basact= scene->basact;
-       Object *ob= basact->object;
+       Base *basact= CTX_data_active_base(C);
+       Object *ob= CTX_data_active_object(C);
        Object *obedit = CTX_data_edit_object(C);
        EditMesh *em= NULL;
        int bit, ctrl=0, shift=0; // XXX shift arg?


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