Mercurial > fife-parpg

comparison engine/core/view/renderers/blockinginforenderer.cpp @ 684:4f36c890b1dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merged the 0.3.3dev branche changes to the trunk.
author helios2000@33b003aa-7bff-0310-803a-e67f0ece8222
date Mon, 06 Dec 2010 19:25:27 +0000
parents b2feacaed53c
children
comparison
equal deleted inserted replaced
683:4fe9747d5f88 684:4f36c890b1dd
76 76
77 Rect cv = cam->getViewPort(); 77 Rect cv = cam->getViewPort();
78 RenderList::const_iterator instance_it = instances.begin(); 78 RenderList::const_iterator instance_it = instances.begin();
79 for (;instance_it != instances.end(); ++instance_it) { 79 for (;instance_it != instances.end(); ++instance_it) {
80 Instance* instance = (*instance_it)->instance; 80 Instance* instance = (*instance_it)->instance;
81 if (!instance->getObject()->isBlocking()) { 81 if (!instance->getObject()->isBlocking() || !instance->isBlocking()) {
82 continue; 82 continue;
83 } 83 }
84 std::vector<ExactModelCoordinate> vertices; 84 std::vector<ExactModelCoordinate> vertices;
85 cg->getVertices(vertices, instance->getLocationRef().getLayerCoordinates()); 85 cg->getVertices(vertices, instance->getLocationRef().getLayerCoordinates());
86 std::vector<ExactModelCoordinate>::const_iterator it = vertices.begin(); 86 std::vector<ExactModelCoordinate>::const_iterator it = vertices.begin();