← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/modifiers/intern/MOD_ocean.c

  • 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:
source/blender/modifiers/intern/MOD_ocean.c
318
318
 
319
319
        /* create vertices */
320
320
        #pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES)
321
 
        for (y = 0; y < res_y + 1; y++) {
322
 
                for (x = 0; x < res_x + 1; x++) {
 
321
        for (y = 0; y <= res_y; y++) {
 
322
                for (x = 0; x <= res_x; x++) {
323
323
                        const int i = y * (res_x + 1) + x;
324
324
                        float *co = mverts[i].co;
325
325
                        co[0] = ox + (x * sx);