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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2016-08-18 03:18:39 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-08-18 03:24:24 +0300
commitf92a6b8d1bea43d7b539d3e268913100257db981 (patch)
treef57f24931928da18d1bcc702407af94880990519
parente8b5e66db18c315970dfcb063bced40264841228 (diff)
Fix compiler warning after fix for T48913.
-rw-r--r--source/blender/blenkernel/intern/object_dupli.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 3a0222b1c4b..14cc5ec0849 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -221,7 +221,7 @@ static void make_child_duplis(const DupliContext *ctx, void *userdata, MakeChild
if (ctx->group) {
unsigned int lay = ctx->group->layer;
- unsigned int groupid = 0;
+ int groupid = 0;
GroupObject *go;
for (go = ctx->group->gobject.first; go; go = go->next, groupid++) {
Object *ob = go->ob;
@@ -240,7 +240,7 @@ static void make_child_duplis(const DupliContext *ctx, void *userdata, MakeChild
}
else {
unsigned int lay = ctx->scene->lay;
- unsigned int baseid = 0;
+ int baseid = 0;
Base *base;
for (base = ctx->scene->base.first; base; base = base->next, baseid++) {
Object *ob = base->object;