← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/editors/space_info/info_stats.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/editors/space_info/info_stats.c
115
115
                {
116
116
                        int totv = 0, totf = 0, tottri = 0;
117
117
 
118
 
                        if (ob->disp.first)
119
 
                                BKE_displist_count(&ob->disp, &totv, &totf, &tottri);
 
118
                        if (ob->curve_cache && ob->curve_cache->disp.first)
 
119
                                BKE_displist_count(&ob->curve_cache->disp, &totv, &totf, &tottri);
120
120
 
121
121
                        totv   *= totob;
122
122
                        totf   *= totob;
194
194
                                a = nu->pntsu;
195
195
                                while (a--) {
196
196
                                        stats->totvert += 3;
197
 
                                        if (bezt->f1) stats->totvertsel++;
198
 
                                        if (bezt->f2) stats->totvertsel++;
199
 
                                        if (bezt->f3) stats->totvertsel++;
 
197
                                        if (bezt->f1 & SELECT) stats->totvertsel++;
 
198
                                        if (bezt->f2 & SELECT) stats->totvertsel++;
 
199
                                        if (bezt->f3 & SELECT) stats->totvertsel++;
200
200
                                        bezt++;
201
201
                                }
202
202
                        }