← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/img/intern/IMG_BrushRGBA32.h

  • Committer: Bazaar Package Importer
  • Author(s): Lukas Fittl
  • Date: 2006-09-20 01:57:27 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060920015727-gmoqlxwstx9wwqs3
Tags: 2.42a-1ubuntu1
* Merge from Debian unstable (Closes: Malone #55903). Remaining changes:
  - debian/genpot: Add python scripts from Lee June <blender@eyou.com> to
    generate a reasonable PO template from the sources. Since gettext is used
    in a highly nonstandard way, xgettext does not work for this job.
  - debian/rules: Call the scripts, generate po/blender.pot, and clean it up
    in the clean target.
  - Add a proper header to the generated PO template.
* debian/control: Build depend on libavformat-dev >= 3:0.cvs20060823-3.1,
  otherwise this package will FTBFS

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/img/intern/IMG_BrushRGBA32.h
1
1
/**
2
 
 * $Id: IMG_BrushRGBA32.h,v 1.6 2005/09/09 22:31:23 bjornmose Exp $
 
2
 * $Id: IMG_BrushRGBA32.h,v 1.7 2006/01/31 21:43:59 bjornmose Exp $
3
3
 *
4
4
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
5
5
 *
97
97
         * @param       rI      inner radius
98
98
         * @param       rO      outer radius
99
99
         */
100
 
        inline virtual void setRadii(TUns32& rI, TUns32& rO) const;
 
100
        inline virtual void getRadii(TUns32& rI, TUns32& rO) const;
101
101
 
102
102
protected:
103
103
        /**
113
113
};
114
114
 
115
115
 
116
 
inline void IMG_BrushRGBA32::setRadii(TUns32& rI, TUns32& rO) const
 
116
inline void IMG_BrushRGBA32::getRadii(TUns32& rI, TUns32& rO) const
117
117
{
118
118
        rI = m_ri;
119
119
        rO = m_ro;