Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Weikert <elubie@gmx.net>2014-02-16 18:47:08 +0400
committerAndrea Weikert <elubie@gmx.net>2014-02-16 18:47:08 +0400
commit6c7f9f67fd4fdc792e003f10389de9dbcf3d0114 (patch)
tree68e02b9dd95eb2b0765fb094d20c6d0f4a5ad766 /source/blender/blenkernel/intern/object_dupli.c
parent191183b304d88d8c3786a9fcd5f6c11d97c829f3 (diff)
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.
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.c')
-rw-r--r--source/blender/blenkernel/intern/object_dupli.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 74426df58c7..b3726ebc8da 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 */
{