[Bf-blender-cvs] [41ec1ad] master: Correct bad cast, unused var warning

Campbell Barton noreply at git.blender.org
Tue Dec 27 05:06:22 CET 2016


Commit: 41ec1adb030361df1e31d9db121f683900a464f1
Author: Campbell Barton
Date:   Tue Dec 27 15:27:38 2016 +1100
Branches: master
https://developer.blender.org/rB41ec1adb030361df1e31d9db121f683900a464f1

Correct bad cast, unused var warning

===================================================================

M	source/blender/blenloader/intern/readfile.c
M	source/blender/editors/space_image/image_ops.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index f568a74..b38d28b 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8381,6 +8381,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
 static void do_versions_after_linking(Main *main)
 {
+	UNUSED_VARS(main);
 //	printf("%s for %s (%s), %d.%d\n", __func__, main->curlib ? main->curlib->name : main->name,
 //	       main->curlib ? "LIB" : "MAIN", main->versionfile, main->subversionfile);
 }
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 6a1c0e7..324a3cb 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1475,7 +1475,7 @@ static int image_match_len_exec(bContext *C, wmOperator *UNUSED(op))
 	if (!ima || !iuser || !BKE_image_has_anim(ima))
 		return OPERATOR_CANCELLED;
 
-	struct ImageAnim *anim = ((ImageAnim *)ima->anims.first)->anim;
+	struct anim *anim = ((ImageAnim *)ima->anims.first)->anim;
 	if (!anim)
 		return OPERATOR_CANCELLED;
 	iuser->frames = IMB_anim_get_duration(anim, IMB_TC_RECORD_RUN);




More information about the Bf-blender-cvs mailing list