Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / object_dupli.c
index 076bef71875b2229a2359dfb630566544d84c8b3..1f10ed252491aa08cf1ca1d01dd20aa317a94f7c 100644 (file)
@@ -49,7 +49,6 @@
 
 #include "BKE_animsys.h"
 #include "BKE_DerivedMesh.h"
-#include "BKE_depsgraph.h"
 #include "BKE_font.h"
 #include "BKE_group.h"
 #include "BKE_global.h"
@@ -62,6 +61,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_anim.h"
 
+#include "DEG_depsgraph.h"
 
 #include "BLI_strict_flags.h"
 #include "BLI_hash.h"
@@ -77,7 +77,6 @@ typedef struct DupliContext {
        Scene *scene;
        Object *object;
        float space_mat[4][4];
-       unsigned int lay;
 
        int persistent_id[MAX_DUPLI_RECUR];
        int level;
@@ -110,7 +109,6 @@ static void init_context(DupliContext *r_ctx, EvaluationContext *eval_ctx, Scene
                copy_m4_m4(r_ctx->space_mat, space_mat);
        else
                unit_m4(r_ctx->space_mat);
-       r_ctx->lay = ob->lay;
        r_ctx->level = 0;
 
        r_ctx->gen = get_dupli_generator(r_ctx);
@@ -259,7 +257,7 @@ static void make_child_duplis(const DupliContext *ctx, void *userdata, MakeChild
        else {
                unsigned int lay = ctx->scene->lay;
                int baseid = 0;
-               Base *base;
+               BaseLegacy *base;
                for (base = ctx->scene->base.first; base; base = base->next, baseid++) {
                        Object *ob = base->object;