[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21423] branches/blender2.5/blender/source /blender/editors/object/object_edit.c: This fixes some NULL checks.

[Peter Schlaile]

Revision: 21423
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21423
Author:   schlaile
Date:     2009-07-08 13:18:47 +0200 (Wed, 08 Jul 2009)

Log Message:
-----------
This fixes some NULL checks.

* base was referenced before NULL check
* ob wasn't checked for NULL

Still broken: Add Mesh doesn't seem to work in Object Mode.
But now it doesn't crash anymore...

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/object/object_edit.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-07-08 10:46:57 UTC (rev 21422)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c     
2009-07-08 11:18:47 UTC (rev 21423)
@@ -3261,7 +3261,7 @@
 {
        Scene *scene= CTX_data_scene(C);
        Base *base= CTX_data_active_base(C);
-       Object *ob= base->object;
+       Object *ob;
        ScrArea *sa= CTX_wm_area(C);
        View3D *v3d= NULL;
        int ok= 0;
@@ -3273,7 +3273,10 @@
                v3d= sa->spacedata.first;
        
        if((v3d==NULL || (base->lay & v3d->lay))==0) return;
-       
+
+       ob = base->object;
+
+       if(ob==NULL) return;
        if(ob->data==NULL) return;
        
        if (object_data_is_libdata(ob)) {


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