← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/collada/ExtraHandler.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:
source/blender/collada/ExtraHandler.h
61
61
        bool parseElement ( 
62
62
                const char* profileName, 
63
63
                const unsigned long& elementHash, 
64
 
                const COLLADAFW::UniqueId& uniqueId );
 
64
                const COLLADAFW::UniqueId& uniqueId,
 
65
                COLLADAFW::Object* object);
 
66
 
 
67
        /** For backwards compatibility with older OpenCollada, new version added object parameter */
 
68
        bool parseElement ( 
 
69
                const char* profileName, 
 
70
                const unsigned long& elementHash, 
 
71
                const COLLADAFW::UniqueId& uniqueId);
65
72
private:
66
73
        /** Disable default copy constructor. */
67
74
        ExtraHandler(const ExtraHandler& pre);