[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25056] trunk/blender/source/blender/ editors/transform: Bugfix: crash when no active object

[Martin Poirier]

Revision: 25056
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25056
Author:   theeth
Date:     2009-12-02 01:53:33 +0100 (Wed, 02 Dec 2009)

Log Message:
-----------
Bugfix: crash when no active object

Misc fixes.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/editors/transform/transform_ops.c
    trunk/blender/source/blender/editors/transform/transform_snap.c

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c      
2009-12-01 23:55:33 UTC (rev 25055)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c      
2009-12-02 00:53:33 UTC (rev 25056)
@@ -5316,9 +5316,6 @@
                }
        }
        else {
-               // t->flag &= ~T_PROP_EDIT; /* no proportional edit in object 
mode */
-               t->options |= CTX_NO_PET;
-               
                createTransObject(C, t);
                t->flag |= T_OBJECT;
 

Modified: trunk/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_ops.c      
2009-12-01 23:55:33 UTC (rev 25055)
+++ trunk/blender/source/blender/editors/transform/transform_ops.c      
2009-12-02 00:53:33 UTC (rev 25056)
@@ -269,6 +269,7 @@
                        if (op->type->idname == tmode->idname)
                        {
                                mode = tmode->mode;
+                               break;
                        }
                }
 

Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c     
2009-12-01 23:55:33 UTC (rev 25055)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c     
2009-12-02 00:53:33 UTC (rev 25056)
@@ -432,7 +432,7 @@
                }
                /* Particles edit mode*/
                else if (t->tsnap.applySnap != NULL && // A snapping function 
actually exist
-                       (obedit == NULL && BASACT->object && 
BASACT->object->mode & OB_MODE_PARTICLE_EDIT ))
+                       (obedit == NULL && BASACT && BASACT->object && 
BASACT->object->mode & OB_MODE_PARTICLE_EDIT ))
                {
                        t->tsnap.modeSelect = SNAP_ALL;
                }


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