Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/modifiers/intern/MOD_particleinstance.c')
-rw-r--r--source/blender/modifiers/intern/MOD_particleinstance.c23
1 files changed, 8 insertions, 15 deletions
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c
index 54e1a0099a2..e903e41db3b 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@ -36,27 +36,18 @@
#include "math.h"
#include "float.h"
-#include "BLI_kdtree.h"
+#include "BLI_math.h"
+#include "BLI_listbase.h"
#include "BLI_rand.h"
-#include "BLI_uvproject.h"
#include "MEM_guardedalloc.h"
-#include "DNA_armature_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_object_fluidsim.h"
-
+#include "DNA_meshdata_types.h"
#include "BKE_action.h"
-#include "BKE_bmesh.h"
-#include "BKE_cloth.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
#include "BKE_fluidsim.h"
-#include "BKE_global.h"
#include "BKE_multires.h"
#include "BKE_key.h"
#include "BKE_lattice.h"
@@ -76,6 +67,8 @@
#include "depsgraph_private.h"
#include "BKE_deform.h"
#include "BKE_shrinkwrap.h"
+#include "BKE_utildefines.h"
+
#include "MOD_modifiertypes.h"
@@ -109,7 +102,7 @@ static int dependsOnTime(ModifierData *md)
return 0;
}
static void updateDepgraph(ModifierData *md, DagForest *forest,
- Scene *scene,Object *ob, DagNode *obNode)
+ struct Scene *scene,Object *ob, DagNode *obNode)
{
ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData*) md;
@@ -229,7 +222,7 @@ static DerivedMesh * applyModifier(
*mv = *inMV;
/*change orientation based on object trackflag*/
- VECCOPY(temp_co,mv->co);
+ copy_v3_v3(temp_co, mv->co);
mv->co[axis]=temp_co[track];
mv->co[(axis+1)%3]=temp_co[(track+1)%3];
mv->co[(axis+2)%3]=temp_co[(track+2)%3];
@@ -339,7 +332,7 @@ static DerivedMesh * applyModifier(
return result;
}
static DerivedMesh *applyModifierEM(
- ModifierData *md, Object *ob, EditMesh *editData,
+ ModifierData *md, Object *ob, struct EditMesh *editData,
DerivedMesh *derivedData)
{
return applyModifier(md, ob, derivedData, 0, 1);