[Bf-blender-cvs] [154b045f54] id_override_static: Alembic: #undef'ed the correct macro

Sybren A. Stüvel noreply at git.blender.org
Thu Feb 9 14:52:19 CET 2017


Commit: 154b045f54165685b8fba562c463d81a064e7e06
Author: Sybren A. Stüvel
Date:   Tue Feb 7 14:53:09 2017 +0100
Branches: id_override_static
https://developer.blender.org/rB154b045f54165685b8fba562c463d81a064e7e06

Alembic: #undef'ed the correct macro

TEST_RET is not defined anywhere in Blender's sources, and LAYER_CMP
is no longer used after this function ends.

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

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

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

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 98d37fb07b..c9f0b8ec9c 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -2595,7 +2595,7 @@ bool CustomData_from_bmeshpoly_test(CustomData *fdata, CustomData *pdata, Custom
 	if (!LAYER_CMP(ldata, CD_TANGENT, fdata, CD_TANGENT))
 		return false;
 
-#undef TEST_RET
+#undef LAYER_CMP
 
 	/* if no layers are on either CustomData's,
 	 * then there was nothing to do... */




More information about the Bf-blender-cvs mailing list