diff options
author | Martin Poirier <theeth@yahoo.com> | 2009-12-02 03:53:33 +0300 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2009-12-02 03:53:33 +0300 |
commit | d86a27f7b6d7b226d7369f17df6bcc3f24325e73 (patch) | |
tree | 8cc99c254ceccee410178645253248f041e8aa84 | |
parent | 5d4b45e2d9513251989fde089f9495e1af900ab2 (diff) |
Bugfix: crash when no active object
Misc fixes.
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 3 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_ops.c | 1 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 403d8449a67..33e37ec8536 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5316,9 +5316,6 @@ void createTransData(bContext *C, TransInfo *t) } } else { - // t->flag &= ~T_PROP_EDIT; /* no proportional edit in object mode */ - t->options |= CTX_NO_PET; - createTransObject(C, t); t->flag |= T_OBJECT; diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index 1b8b331af62..6ab2982b51e 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -269,6 +269,7 @@ static int transformops_data(bContext *C, wmOperator *op, wmEvent *event) if (op->type->idname == tmode->idname) { mode = tmode->mode; + break; } } diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 7f1e67b62ac..ae28986017f 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -432,7 +432,7 @@ void initSnapping(TransInfo *t, wmOperator *op) } /* 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; } |