← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to intern/dualcon/intern/octree.cpp

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/dualcon/intern/octree.cpp
20
20
 * ***** END GPL LICENSE BLOCK *****
21
21
 */
22
22
 
 
23
#ifdef WITH_CXX_GUARDEDALLOC
 
24
#  include "MEM_guardedalloc.h"
 
25
#endif
 
26
 
23
27
#include "octree.h"
24
28
#include <Eigen/Dense>
25
29
#include <limits>
102
106
 
103
107
Octree::~Octree()
104
108
{
 
109
        delete cubes;
105
110
        freeMemory();
106
111
}
107
112
 
1906
1911
                                        maxtotal = total;
1907
1912
                                }
1908
1913
                                dc_printf(".\n");
 
1914
                                delete queue;
1909
1915
                                continue;
1910
1916
                        }
1911
1917
 
1912
1918
                        if (total >= threshold) {
1913
1919
                                dc_printf("Maintained.\n");
 
1920
                                delete queue;
1914
1921
                                continue;
1915
1922
                        }
1916
1923
                        dc_printf("Less then %d, removing...\n", threshold);
1997
2004
                                        }
1998
2005
                                }
1999
2006
                        }
 
2007
 
 
2008
                        delete queue;
2000
2009
                }
2001
2010
        }
2002
2011
 
2173
2182
                        ata[4] += (float)(norm[1] * norm[2]);
2174
2183
                        ata[5] += (float)(norm[2] * norm[2]);
2175
2184
 
2176
 
                        double pn = p[0] * norm[0] + p[1] * norm[1] + p[2] * norm[2];
 
2185
                        const float pn = p[0] * norm[0] + p[1] * norm[1] + p[2] * norm[2];
2177
2186
 
2178
2187
                        atb[0] += (float)(norm[0] * pn);
2179
2188
                        atb[1] += (float)(norm[1] * pn);