Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-05-25 13:06:32 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-05-25 13:06:32 +0400
commitaef443ab2d27a79160cca0588bc221457572cead (patch)
tree0f4485b7bc1637dac24460100fd1ccd00bebe18c /source/blender/editors/transform/transform_ops.c
parentb3f9117523d33568c6a8df1a34bbb695d3d53e1e (diff)
Fix T40438: Pressing G key to move the camera quits Blender.
Diffstat (limited to 'source/blender/editors/transform/transform_ops.c')
-rw-r--r--source/blender/editors/transform/transform_ops.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index c6c9e84a125..7bdbbf7289d 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -394,7 +394,8 @@ static int transform_modal(bContext *C, wmOperator *op, const wmEvent *event)
/* XXX, workaround: active needs to be calculated before transforming,
* since we're not reading from 'td->center' in this case. see: T40241 */
if (t->tsnap.target == SCE_SNAP_TARGET_ACTIVE) {
- if ((t->tsnap.status & TARGET_INIT) == 0) {
+ /* In camera view, tsnap callback is not set (see initSnappingMode() in transfrom_snap.c, and T40348). */
+ if (t->tsnap.targetSnap && ((t->tsnap.status & TARGET_INIT) == 0)) {
t->tsnap.targetSnap(t);
}
}