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@pandora.be>2010-03-14 23:24:11 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-03-14 23:24:11 +0300
commited076d74ef3f0593971108511dc25e63cab7e829 (patch)
treed52679de90117424affcfd5c106884f7696d4c79 /source/blender/render/intern/include
parent114f437837a4b1711c85f0a3e229df04f2d0420d (diff)
Rendering from 3d view in local view or with unlocked layer was not
working yet, now layer is passed along to render engine, changes quite a few files because simple swapping trick no longer works with threading.
Diffstat (limited to 'source/blender/render/intern/include')
-rw-r--r--source/blender/render/intern/include/render_types.h1
-rw-r--r--source/blender/render/intern/include/renderdatabase.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index e093c1a6c99..0b0ea075d79 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -174,6 +174,7 @@ struct Render
Scene *scene;
RenderData r;
World wrld;
+ unsigned int lay;
ListBase parts;
diff --git a/source/blender/render/intern/include/renderdatabase.h b/source/blender/render/intern/include/renderdatabase.h
index 9ed12a8fe60..2a0086b436c 100644
--- a/source/blender/render/intern/include/renderdatabase.h
+++ b/source/blender/render/intern/include/renderdatabase.h
@@ -137,7 +137,7 @@ void RE_set_customdata_names(struct ObjectRen *obr, struct CustomData *data);
/* convertblender.c */
void init_render_world(Render *re);
-void RE_Database_FromScene_Vectors(Render *re, struct Scene *sce);
+void RE_Database_FromScene_Vectors(Render *re, struct Scene *sce, unsigned int lay);
#endif /* RENDERDATABASE_H */