← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/yafray/intern/yafray_Render.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2007-05-17 11:47:59 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070517114759-yp4ybrnhp2u7pk66
Tags: 2.44-1
* New upstream release.
* Drop debian/patches/01_64bits_stupidity, not needed anymore: as of this
  version blender is 64 bits safe again. Adjust README.Debian accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/yafray/intern/yafray_Render.cpp
151
151
 
152
152
        // now remove any objects from dupliMtx_list which are not in the renderlist
153
153
        for (map<string, vector<float> >::iterator dL=dupliMtx_list.begin();
154
 
                                dL!=dupliMtx_list.end();++dL)
 
154
                                dL!=dupliMtx_list.end();)
155
155
        {
156
156
                string ro_name = dL->first;
157
157
                if (renderobs.find(ro_name)==renderobs.end()) {
158
158
                        cout << "Object " << ro_name << " not in renderlist, removing from dupliMtx_list" << endl;
159
159
                        dL->second.clear();
 
160
                        ++dL;
160
161
                        dupliMtx_list.erase(ro_name);
161
162
                }
 
163
                else
 
164
                        ++dL;
162
165
        }
163
166
 
164
167
        // in case dupliMtx_list not empty, make sure that there is at least one source object