← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to krita/plugins/paintops/libbrush/kis_gbr_brush_factory.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-10-27 17:52:57 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101027175257-s04zqqk5bs8ckm9o
Tags: 1:2.2.83-0ubuntu1
* Merge with Debian git remaining changes:
 - Add build-deps on librcps-dev, opengtl-dev, libqtgtl-dev, freetds-dev,
   create-resources, libspnav-dev
 - Remove needless build-dep on libwv2-dev
 - koffice-libs recommends create-resources
 - krita recommends pstoedit
 - Keep our patches
* New upstream release 2.3 beta 3
  - Remove debian/patches fixed by upstream
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
krita/plugins/paintops/libbrush/kis_gbr_brush_factory.cpp
35
35
    KoResourceServer<KisBrush>* rServer = KisBrushServer::instance()->brushServer();
36
36
    QString brushFileName = brushDefinition.attribute("filename", "9circle.gbr");
37
37
    KisBrushSP brush = rServer->getResourceByFilename(brushFileName);
 
38
    //Fallback for files that still use the old format
 
39
    if(!brush) {
 
40
        QFileInfo info(brushFileName);
 
41
        brush = rServer->getResourceByFilename(info.fileName());
 
42
    }
38
43
    if(!brush)
39
44
        return 0;
40
45