[Bf-blender-cvs] [ec6b87e] multiview: Bitwise flags typo
Dalai Felinto
noreply at git.blender.org
Wed Feb 25 20:48:22 CET 2015
Commit: ec6b87e89f165759297c66f4516831d8fed3cd68
Author: Dalai Felinto
Date: Tue Feb 24 17:55:39 2015 -0300
Branches: multiview
https://developer.blender.org/rBec6b87e89f165759297c66f4516831d8fed3cd68
Bitwise flags typo
===================================================================
M source/blender/blenkernel/intern/image.c
M source/blender/editors/space_image/image_ops.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 2fd65ed..218084f 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2725,7 +2725,7 @@ static void image_init_multilayer_multiview_flag(Image *ima, RenderResult *rr)
if (BLI_listbase_count_ex(&rr->views, 2) > 1)
ima->flag |= IMA_IS_MULTIVIEW;
else
- ima->flag &= IMA_IS_MULTIVIEW;
+ ima->flag &= ~IMA_IS_MULTIVIEW;
}
}
else {
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index ba54f5a..c062b6c 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1102,8 +1102,8 @@ static int image_open_exec(bContext *C, wmOperator *op)
*ima->stereo3d_format = imf->stereo3d_format;
}
else {
- ima->flag &= IMA_IS_STEREO;
- ima->flag &= IMA_IS_MULTIVIEW;
+ ima->flag &= ~IMA_IS_STEREO;
+ ima->flag &= ~IMA_IS_MULTIVIEW;
BKE_image_free_views(ima);
/* monoview and multiview rely on individual images */
More information about the Bf-blender-cvs
mailing list