← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/blender/makesdna/DNA_modifier_types.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/makesdna/DNA_modifier_types.h
1
1
/**
2
 
 * $Id: DNA_modifier_types.h 16754 2008-09-26 21:21:20Z jaguarandi $ 
 
2
 * $Id: DNA_modifier_types.h 19646 2009-04-10 19:40:21Z jhk $ 
3
3
 */
4
4
 
5
5
#ifndef DNA_MODIFIER_TYPES_H
39
39
        eModifierType_Fluidsim,
40
40
        eModifierType_Mask,
41
41
        eModifierType_SimpleDeform,
 
42
        eModifierType_Surface,
42
43
        NUM_MODIFIER_TYPES
43
44
} ModifierType;
44
45
 
418
419
        struct BVHTree *bvhtree; /* bounding volume hierarchy for this cloth object */
419
420
} CollisionModifierData;
420
421
 
 
422
typedef struct SurfaceModifierData {
 
423
        ModifierData    modifier;
 
424
 
 
425
        struct DerivedMesh *dm;
 
426
 
 
427
        struct BVHTreeFromMesh *bvhtree; /* bounding volume hierarchy of the mesh faces */
 
428
} SurfaceModifierData;
 
429
 
421
430
typedef enum {
422
431
        eBooleanModifierOp_Intersect,
423
432
        eBooleanModifierOp_Union,