diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-26 21:41:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-26 21:41:09 +0400 |
| commit | 4c2de5e0c78ff4ec2a0ac9d8d3535d00d72b4f2a (patch) | |
| tree | 3cb92daa832597fac16c863d1287104b67df23a8 /source/blender/editors | |
| parent | 7f1a76887f975e4385684241d5be4cffa297afb0 (diff) | |
fix some types and incorrect info
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 9 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 95e43e2ab24..4626600f2cf 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -914,12 +914,13 @@ static int image_open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event) if (prop) { PointerRNA oldptr; + Image *oldima; oldptr = RNA_property_pointer_get(&ptr, prop); - ima = (Image *)oldptr.id.data; - /* unlikely but better avoid strange crash */ - if (ima && GS(ima->id.name) != ID_IM) { - ima = NULL; + oldima = (Image *)oldptr.id.data; + /* unlikely to fail but better avoid strange crash */ + if (oldima && GS(oldima->id.name) != ID_IM) { + ima = oldima; } } } diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index e3a9d06222b..597be0fd33b 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -438,7 +438,7 @@ static short apply_targetless_ik(Object *ob) /* rotation */ /* [#22409] is partially caused by this, as slight numeric error introduced during * the solving process leads to locked-axis values changing. However, we cannot modify - * the values here, or else there are huge discreptancies between IK-solver (interactive) + * the values here, or else there are huge discrepancies between IK-solver (interactive) * and applied poses. */ if (parchan->rotmode > 0) |