griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed an issue regarding render layers. Now the Freestyle renderer builds a view map based on selected object layers in a render layer, instead of the global selection of object layers. This allows, for example, to have two render layers, one for rendering solid faces in all object layers, and the other for rendering outlines of objects in selected object layers by Freestyle. At the moment, the number of Freestyle-enabled render layers is restricted to one -- a better fix is in the future work.

Browse Source
This commit is contained in:
Tamito Kajiyama
2009-03-02 03:30:59 +00:00
parent 20496ca644
commit cd202bc3b6
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/freestyle/intern/scene_graph/BlenderFileLoader.cpp
View File

@@ -19,12 +19,30 @@ NodeGroup* BlenderFileLoader::Load()
ObjectRen *obr;
cout << "\n=== Importing triangular meshes into Blender ===" << endl;
SceneRenderLayer *srl, *active_srl = NULL;
int count = 0;
for(srl= (SceneRenderLayer *)_re->scene->r.layers.first; srl; srl= srl->next) {
if(srl->layflag & SCE_LAY_FRS) {
if (!active_srl) active_srl = srl;
count++;
}
}
if (count > 1) {
cout << "Warning: Freestyle is enabled in the following " << count << " scene render layers:" << endl;
for(srl= (SceneRenderLayer *)_re->scene->r.layers.first; srl; srl= srl->next)
if(srl->layflag & SCE_LAY_FRS)
cout << " \"" << srl->name << "\"" << ((active_srl == srl) ? " (only this is taken into account)" : "") << endl;
}
// creation of the scene root node
_Scene = new NodeGroup;
int id = 0;
for(obi= (ObjectInstanceRen *) _re->instancetable.first; obi; obi=obi->next) {
if (!(obi->lay & _re->scene->lay & active_srl->lay))
continue;
obr= obi->obr;
if( obr->totvlak > 0)