diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-04 11:44:42 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-04 11:44:42 +0300 |
| commit | e9ce90c23834e0f9154ab97326a55db62d62b4d7 (patch) | |
| tree | 83aaf08425b7ec7660a11760e67eaece23a0005b /source/blender/makesdna/DNA_texture_types.h | |
| parent | 3c6b721fc90f5dc387c4493e0d78e77b728079b7 (diff) | |
Fix bug #19699: point density texture doesn't save particle system.
Non-ID pointers in DNA can only point to data from own ID block, so
now instead it uses an index into the particle system list, but still
exposed as a pointer through RNA.
Diffstat (limited to 'source/blender/makesdna/DNA_texture_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index a43e5c7ae13..eac7a97f0c0 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -159,12 +159,10 @@ typedef struct PointDensity { int pdpad; struct Object *object; /* for 'Object' or 'Particle system' type - source object */ - struct ParticleSystem *psys; + int psys; /* index+1 in ob.particlesystem, non-ID pointer not allowed */ short psys_cache_space; /* cache points in worldspace, object space, ... ? */ short ob_cache_space; /* cache points in worldspace, object space, ... ? */ - short pdpad2[2]; - void *point_tree; /* the acceleration tree containing points */ float *point_data; /* dynamically allocated extra for extra information, like particle age */ |