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:
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
-rw-r--r--source/blender/editors/space_image/image_ops.c9
1 files changed, 5 insertions, 4 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;
}
}
}