diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-08-05 12:28:03 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-05 12:28:03 +0400 |
commit | aa1477cce1452b117769d1a6614294a3ebfd2314 (patch) | |
tree | 7975face94c0bcf5b30eea4a552a6e1dc68c4f1b /source/blender/editors/transform/transform_generics.c | |
parent | cbb7eefe45e05f7357e60345c119b68e82138e7b (diff) | |
parent | f48631e9a4afb8d7d4ab4e15963b38ba75605f68 (diff) |
https://svn.blender.org/svnroot/bf-blender/trunk/blender, in sync with trunk now
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-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 9df00163302..d5ff475566e 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -889,6 +889,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); @@ -1017,7 +1018,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; |