← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/BKE_particle.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/blenkernel/BKE_particle.h
1
1
/* BKE_particle.h
2
2
 *
3
3
 *
4
 
 * $Id: BKE_particle.h $
 
4
 * $Id: BKE_particle.h 19552 2009-04-06 00:10:52Z jhk $
5
5
 *
6
6
 * ***** BEGIN GPL LICENSE BLOCK *****
7
7
 *
173
173
 
174
174
        /* path caching */
175
175
        int editupdate, between, steps;
176
 
        int totchild, totparent;
 
176
        int totchild, totparent, parent_pass;
177
177
 
178
178
        float cfra;
179
179
 
188
188
        int num, tot;
189
189
} ParticleThread;
190
190
 
 
191
typedef struct ParticleBillboardData
 
192
{
 
193
        struct Object *ob;
 
194
        float vec[3], vel[3];
 
195
        float offset[2];
 
196
        float size, tilt, random, time;
 
197
        int uv[3];
 
198
        int lock, num;
 
199
        int totnum;
 
200
        short align, uv_split, anim, split_offset;
 
201
}
 
202
ParticleBillboardData;
 
203
 
191
204
/* ----------- functions needed outside particlesystem ---------------- */
192
205
/* particle.c */
193
206
int count_particles(struct ParticleSystem *psys);
260
273
void psys_thread_distribute_particle(ParticleThread *thread, struct ParticleData *pa, struct ChildParticle *cpa, int p);
261
274
void psys_thread_create_path(ParticleThread *thread, struct ChildParticle *cpa, ParticleCacheKey *keys, int i);
262
275
 
 
276
void psys_make_billboard(ParticleBillboardData *bb, float xvec[3], float yvec[3], float zvec[3], float center[3]);
 
277
 
263
278
/* particle_system.c */
264
279
int psys_count_keyed_targets(struct Object *ob, struct ParticleSystem *psys);
265
280
void psys_get_reactor_target(struct Object *ob, struct ParticleSystem *psys, struct Object **target_ob, struct ParticleSystem **target_psys);