diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-07 19:25:06 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-07 19:25:06 +0400 |
| commit | daab78bc614fdf19d1e56558972347121e82e06e (patch) | |
| tree | 39c919901b6add092817f6c87861030aab97578e /source/blender/editors/transform | |
| parent | b057cf1bb118a070e2eeb3b2029aa80fad00a9b2 (diff) | |
| parent | bf23acf3bb8ae43e6a50108a00e7572fe35edea4 (diff) | |
Merging trunk up to r39145.
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index a43fc6a31e5..8d6c56e5cce 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -911,6 +911,7 @@ void resetTransRestrictions(TransInfo *t) t->flag &= ~T_ALL_RESTRICTIONS; } +/* the *op can be NULL */ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) { Scene *sce = CTX_data_scene(C); @@ -1039,7 +1040,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event) } /* initialize UV transform from */ - if (RNA_struct_find_property(op->ptr, "correct_uv")) { + if (op && RNA_struct_find_property(op->ptr, "correct_uv")) { if(RNA_property_is_set(op->ptr, "correct_uv")) { if(RNA_boolean_get(op->ptr, "correct_uv")) { t->settings->uvcalc_flag |= UVCALC_TRANSFORM_CORRECT; |