[Bf-blender-cvs] [74b3947c901] blender2.8: Error in last commit

Campbell Barton noreply at git.blender.org
Mon Apr 23 20:44:56 CEST 2018


Commit: 74b3947c901d75cb5c15815929b0e9e1f1626f75
Author: Campbell Barton
Date:   Mon Apr 23 20:44:41 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB74b3947c901d75cb5c15815929b0e9e1f1626f75

Error in last commit

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

M	source/blender/blenkernel/intern/icons.c

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

diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c
index e47d6761690..e1d1211f6e5 100644
--- a/source/blender/blenkernel/intern/icons.c
+++ b/source/blender/blenkernel/intern/icons.c
@@ -753,8 +753,10 @@ struct Icon_Geom *BKE_icon_geom_from_memory(const uchar *data, size_t data_len)
 	if (data_len <= 8) {
 		goto fail;
 	}
+	/* Skip the header. */
+	data_len -= 8;
 	const int div = 3 * 2 * 3;
-	const int coords_len = (data_len - 8) / div;
+	const int coords_len = data_len / div;
 	if (coords_len * div != data_len) {
 		goto fail;
 	}



More information about the Bf-blender-cvs mailing list