← Back to branch summary

~ubuntu-branches/ubuntu/trusty/openscenegraph/trusty

« back to all changes in this revision

Viewing changes to OpenSceneGraph/src/osgWrappers/osg/StateSet.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Cyril Brulebois
  • Date: 2008-07-29 04:34:38 UTC
  • mfrom: (1.1.6 upstream) (2.1.3 lenny)
  • Revision ID: james.westby@ubuntu.com-20080729043438-no1h9h0dpsrlzp1y
http://bugs.debian.org/477353
http://bugs.debian.org/482239
* Non-maintainer upload.
* No longer try to detect (using /proc/cpuinfo when available) how many
  CPUs are available, fixing the FTBFS (due to -j0) on various platforms
  (Closes: #477353). The right way to do it is to support parallel=n in
  DEB_BUILD_OPTIONS (see Debian Policy §4.9.1), and adequate support has
  been implemented.
* Add patch to fix FTBFS due to the build system now refusing to handle
  whitespaces (Policy CMP0004 say the logs), thanks to Andreas Putzo who
  provided it (Closes: #482239):
   - debian/patches/fix-cmp0004-build-failure.dpatch
* Remove myself from Uploaders, as requested a while ago, done by Luk in
  his 2.2.0-2.1 NMU, which was never acknowledged.

Show diffs side-by-side

added added

removed removed

Lines of Context:
OpenSceneGraph/src/osgWrappers/osg/StateSet.cpp
124
124
        I_Method0(void, computeDataVariance,
125
125
                  Properties::VIRTUAL,
126
126
                  __void__computeDataVariance,
127
 
                  "Compute the DataVariance based on an assestment of callback etc. ",
 
127
                  "Compute the DataVariance based on an assessment of callback etc. ",
128
128
                  "");
129
129
        I_Method0(void, setGlobalDefaults,
130
130
                  Properties::NON_VIRTUAL,
306
306
                  __void__setAssociatedModes__C5_StateAttribute_P1__StateAttribute_GLModeValue,
307
307
                  "",
308
308
                  "");
 
309
        I_Method1(void, removeAssociatedModes, IN, const osg::StateAttribute *, attribute,
 
310
                  Properties::NON_VIRTUAL,
 
311
                  __void__removeAssociatedModes__C5_StateAttribute_P1,
 
312
                  "",
 
313
                  "");
309
314
        I_Method3(void, setAssociatedTextureModes, IN, unsigned int, unit, IN, const osg::StateAttribute *, attribute, IN, osg::StateAttribute::GLModeValue, value,
310
315
                  Properties::NON_VIRTUAL,
311
316
                  __void__setAssociatedTextureModes__unsigned_int__C5_StateAttribute_P1__StateAttribute_GLModeValue,
312
317
                  "",
313
318
                  "");
 
319
        I_Method2(void, removeAssociatedTextureModes, IN, unsigned int, unit, IN, const osg::StateAttribute *, attribute,
 
320
                  Properties::NON_VIRTUAL,
 
321
                  __void__removeAssociatedTextureModes__unsigned_int__C5_StateAttribute_P1,
 
322
                  "",
 
323
                  "");
314
324
        I_MethodWithDefaults2(void, addUniform, IN, osg::Uniform *, uniform, , IN, osg::StateAttribute::OverrideValue, value, osg::StateAttribute::ON,
315
325
                              Properties::NON_VIRTUAL,
316
326
                              __void__addUniform__Uniform_P1__StateAttribute_OverrideValue,