← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to intern/cycles/render/mesh.h

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/cycles/render/mesh.h
55
55
                int first_key;
56
56
                int num_keys;
57
57
                uint shader;
58
 
                uint pad;
59
58
 
60
59
                int num_segments() { return num_keys - 1; }
61
60
        };
111
110
 
112
111
        void reserve(int numverts, int numfaces, int numcurves, int numcurvekeys);
113
112
        void clear();
 
113
        void set_triangle(int i, int v0, int v1, int v2, int shader, bool smooth);
114
114
        void add_triangle(int v0, int v1, int v2, int shader, bool smooth);
115
115
        void add_curve_key(float3 loc, float radius);
116
116
        void add_curve(int first_key, int num_keys, int shader);
141
141
        MeshManager();
142
142
        ~MeshManager();
143
143
 
144
 
        bool displace(Device *device, Scene *scene, Mesh *mesh, Progress& progress);
 
144
        bool displace(Device *device, DeviceScene *dscene, Scene *scene, Mesh *mesh, Progress& progress);
145
145
 
146
146
        /* attributes */
147
147
        void update_osl_attributes(Device *device, Scene *scene, vector<AttributeRequestSet>& mesh_attributes);