[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29689] branches/particles-2010/source/ blender/blenkernel/BKE_particle_emitter.h: svn merge -r 29575:HEAD https:// svn.blender.org/svnroot/bf-blender/branches/particles-2010

[Lukas Tönne]

Revision: 29689
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29689
Author:   lukastoenne
Date:     2010-06-25 14:47:32 +0200 (Fri, 25 Jun 2010)

Log Message:
-----------
svn merge -r 29575:HEAD https://svn.blender.org/svnroot/bf-blender/branches/particles-2010

Modified Paths:
--------------
    branches/particles-2010/source/blender/blenkernel/BKE_particle_emitter.h

Modified: branches/particles-2010/source/blender/blenkernel/BKE_particle_emitter.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_particle_emitter.h	2010-06-25 12:35:23 UTC (rev 29688)
+++ branches/particles-2010/source/blender/blenkernel/BKE_particle_emitter.h	2010-06-25 12:47:32 UTC (rev 29689)
@@ -54,59 +54,3 @@
 void pemit_emitter_step(struct ParticleSimulationData *sim, int emitter, float cfra, float dfra);
 
 #endif
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2007 by Janne Karhu.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef BKE_PARTICLE_EMITTER_H
-#define BKE_PARTICLE_EMITTER_H
-
-#include "DNA_particle_types.h"
-#include "DNA_particle_link_types.h"
-#include "DNA_object_types.h"
-
-#include "BKE_particle_system.h"
-
-struct DerivedMesh;
-struct KDTree;
-struct Material;
-struct MTFace;
-struct MCol;
-struct MFace;
-struct MVert;
-struct Object;
-struct ParticleEmitterModifierData;
-struct RNG;
-struct Scene;
-
-
-void pemit_particle_on_emitter(struct ParticleSimulationData *sim, int emi, int from, int distr, int index, int index_dmcache, float *fuv, float foffset, float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor);
-void pemit_distribute_particles(struct ParticleSimulationData *sim, int from);
-void pemit_thread_distribute_particle(struct ParticleThread *thread, struct ParticleData *pa, struct ChildParticle *cpa, int p);
-
-void pemit_emitter_step(struct ParticleSimulationData *sim, int emitter, float cfra, float dfra);
-
-#endif