[Bf-blender-cvs] [6c7f9f6] master: Fix: compile error due to non-matching type and strict flags for MSVC9
Andrea Weikert
noreply at git.blender.org
Sun Feb 16 15:50:24 CET 2014
Commit: 6c7f9f67fd4fdc792e003f10389de9dbcf3d0114
Author: Andrea Weikert
Date: Sun Feb 16 15:47:08 2014 +0100
https://developer.blender.org/rB6c7f9f67fd4fdc792e003f10389de9dbcf3d0114
Fix: compile error due to non-matching type and strict flags for MSVC9
This fixes a small compile error where MSVC9 complains about conversion from int to unsigned char.
===================================================================
M source/blender/blenkernel/intern/object_dupli.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 74426df..b3726eb 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -780,7 +780,7 @@ static void make_duplis_faces(const DupliContext *ctx)
bool for_render = ctx->eval_ctx->for_render;
FaceDupliData fdd;
- fdd.use_scale = parent->transflag & OB_DUPLIFACES_SCALE;
+ fdd.use_scale = ((parent->transflag & OB_DUPLIFACES_SCALE) != 0);
/* gather mesh info */
{
More information about the Bf-blender-cvs
mailing list