[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12684] branches/cloth/blender: Particle merge: svn merge -r 12653:12664 https://svn.blender.org/svnroot/ bf-blender/trunk/blender
Daniel Genrich
daniel.genrich at gmx.net
Tue Nov 27 00:11:07 CET 2007
Revision: 12684
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12684
Author: genscher
Date: 2007-11-27 00:11:07 +0100 (Tue, 27 Nov 2007)
Log Message:
-----------
Particle merge: svn merge -r 12653:12664 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/cloth/blender/projectfiles_vc7/blender/src/BL_src.vcproj
branches/cloth/blender/release/datafiles/blenderbuttons
branches/cloth/blender/release/datafiles/preview.blend
branches/cloth/blender/source/blender/blenkernel/BKE_DerivedMesh.h
branches/cloth/blender/source/blender/blenkernel/BKE_bad_level_calls.h
branches/cloth/blender/source/blender/blenkernel/BKE_blender.h
branches/cloth/blender/source/blender/blenkernel/BKE_cloth.h
branches/cloth/blender/source/blender/blenkernel/BKE_displist.h
branches/cloth/blender/source/blender/blenkernel/BKE_global.h
branches/cloth/blender/source/blender/blenkernel/BKE_main.h
branches/cloth/blender/source/blender/blenkernel/BKE_modifier.h
branches/cloth/blender/source/blender/blenkernel/BKE_pointcache.h
branches/cloth/blender/source/blender/blenkernel/BKE_softbody.h
branches/cloth/blender/source/blender/blenkernel/BKE_utildefines.h
branches/cloth/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/cloth/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/cloth/blender/source/blender/blenkernel/intern/anim.c
branches/cloth/blender/source/blender/blenkernel/intern/blender.c
branches/cloth/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/cloth/blender/source/blender/blenkernel/intern/cloth.c
branches/cloth/blender/source/blender/blenkernel/intern/customdata.c
branches/cloth/blender/source/blender/blenkernel/intern/depsgraph.c
branches/cloth/blender/source/blender/blenkernel/intern/displist.c
branches/cloth/blender/source/blender/blenkernel/intern/effect.c
branches/cloth/blender/source/blender/blenkernel/intern/ipo.c
branches/cloth/blender/source/blender/blenkernel/intern/library.c
branches/cloth/blender/source/blender/blenkernel/intern/modifier.c
branches/cloth/blender/source/blender/blenkernel/intern/object.c
branches/cloth/blender/source/blender/blenkernel/intern/pointcache.c
branches/cloth/blender/source/blender/blenkernel/intern/scene.c
branches/cloth/blender/source/blender/blenkernel/intern/softbody.c
branches/cloth/blender/source/blender/blenlib/BLI_arithb.h
branches/cloth/blender/source/blender/blenlib/intern/arithb.c
branches/cloth/blender/source/blender/blenlib/intern/threads.c
branches/cloth/blender/source/blender/blenloader/intern/readfile.c
branches/cloth/blender/source/blender/blenloader/intern/writefile.c
branches/cloth/blender/source/blender/include/BDR_editobject.h
branches/cloth/blender/source/blender/include/BIF_butspace.h
branches/cloth/blender/source/blender/include/BIF_editsima.h
branches/cloth/blender/source/blender/include/BIF_editview.h
branches/cloth/blender/source/blender/include/BIF_meshtools.h
branches/cloth/blender/source/blender/include/BIF_resources.h
branches/cloth/blender/source/blender/include/BIF_transform.h
branches/cloth/blender/source/blender/include/BSE_editipo.h
branches/cloth/blender/source/blender/include/blendef.h
branches/cloth/blender/source/blender/include/butspace.h
branches/cloth/blender/source/blender/include/transform.h
branches/cloth/blender/source/blender/makesdna/DNA_ID.h
branches/cloth/blender/source/blender/makesdna/DNA_customdata_types.h
branches/cloth/blender/source/blender/makesdna/DNA_ipo_types.h
branches/cloth/blender/source/blender/makesdna/DNA_material_types.h
branches/cloth/blender/source/blender/makesdna/DNA_meshdata_types.h
branches/cloth/blender/source/blender/makesdna/DNA_modifier_types.h
branches/cloth/blender/source/blender/makesdna/DNA_object_force.h
branches/cloth/blender/source/blender/makesdna/DNA_object_types.h
branches/cloth/blender/source/blender/makesdna/DNA_scene_types.h
branches/cloth/blender/source/blender/makesdna/DNA_texture_types.h
branches/cloth/blender/source/blender/makesdna/intern/makesdna.c
branches/cloth/blender/source/blender/render/extern/include/RE_render_ext.h
branches/cloth/blender/source/blender/render/intern/include/renderdatabase.h
branches/cloth/blender/source/blender/render/intern/source/convertblender.c
branches/cloth/blender/source/blender/render/intern/source/renderdatabase.c
branches/cloth/blender/source/blender/render/intern/source/texture.c
branches/cloth/blender/source/blender/src/blenderbuttons.c
branches/cloth/blender/source/blender/src/butspace.c
branches/cloth/blender/source/blender/src/buttons_editing.c
branches/cloth/blender/source/blender/src/buttons_object.c
branches/cloth/blender/source/blender/src/buttons_shading.c
branches/cloth/blender/source/blender/src/drawimage.c
branches/cloth/blender/source/blender/src/drawobject.c
branches/cloth/blender/source/blender/src/drawscene.c
branches/cloth/blender/source/blender/src/drawview.c
branches/cloth/blender/source/blender/src/edit.c
branches/cloth/blender/source/blender/src/editface.c
branches/cloth/blender/source/blender/src/editipo.c
branches/cloth/blender/source/blender/src/editipo_lib.c
branches/cloth/blender/source/blender/src/editmesh_tools.c
branches/cloth/blender/source/blender/src/editobject.c
branches/cloth/blender/source/blender/src/editscreen.c
branches/cloth/blender/source/blender/src/editsima.c
branches/cloth/blender/source/blender/src/editview.c
branches/cloth/blender/source/blender/src/header_buttonswin.c
branches/cloth/blender/source/blender/src/header_info.c
branches/cloth/blender/source/blender/src/header_ipo.c
branches/cloth/blender/source/blender/src/header_view3d.c
branches/cloth/blender/source/blender/src/headerbuttons.c
branches/cloth/blender/source/blender/src/meshtools.c
branches/cloth/blender/source/blender/src/parametrizer.c
branches/cloth/blender/source/blender/src/preview.blend.c
branches/cloth/blender/source/blender/src/sequence.c
branches/cloth/blender/source/blender/src/space.c
branches/cloth/blender/source/blender/src/toets.c
branches/cloth/blender/source/blender/src/transform.c
branches/cloth/blender/source/blender/src/transform_constraints.c
branches/cloth/blender/source/blender/src/transform_conversions.c
branches/cloth/blender/source/blender/src/transform_generics.c
branches/cloth/blender/source/blender/src/transform_manipulator.c
branches/cloth/blender/source/blender/src/unwrapper.c
branches/cloth/blender/source/blender/src/view.c
Added Paths:
-----------
branches/cloth/blender/source/blender/blenkernel/BKE_particle.h
branches/cloth/blender/source/blender/blenkernel/intern/particle.c
branches/cloth/blender/source/blender/blenkernel/intern/particle_system.c
branches/cloth/blender/source/blender/blenlib/BLI_kdtree.h
branches/cloth/blender/source/blender/blenlib/intern/BLI_kdtree.c
branches/cloth/blender/source/blender/include/BIF_editparticle.h
branches/cloth/blender/source/blender/makesdna/DNA_particle_types.h
branches/cloth/blender/source/blender/src/editparticle.c
Modified: branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2007-11-26 22:53:05 UTC (rev 12683)
+++ branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2007-11-26 23:11:07 UTC (rev 12684)
@@ -435,6 +435,15 @@
RelativePath="..\..\..\source\blender\blenkernel\intern\packedFile.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenkernel\intern\particle.c">
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\blenkernel\intern\particle_system.c">
+ </File>
+ <File
+ RelativePath="..\..\..\source\blender\blenkernel\intern\pointcache.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\intern\property.c">
</File>
<File
@@ -625,6 +634,9 @@
RelativePath="..\..\..\source\blender\blenkernel\BKE_plugin_types.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenkernel\BKE_pointcache.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\BKE_property.h">
</File>
<File
Modified: branches/cloth/blender/projectfiles_vc7/blender/src/BL_src.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/blender/src/BL_src.vcproj 2007-11-26 22:53:05 UTC (rev 12683)
+++ branches/cloth/blender/projectfiles_vc7/blender/src/BL_src.vcproj 2007-11-26 23:11:07 UTC (rev 12684)
@@ -308,6 +308,9 @@
RelativePath="..\..\..\source\blender\src\editoops.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\src\editparticle.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\src\editscreen.c">
</File>
<File
@@ -675,6 +678,9 @@
RelativePath="..\..\..\source\blender\include\BIF_editoops.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\include\BIF_editparticle.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\include\BIF_editsca.h">
</File>
<File
Modified: branches/cloth/blender/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/cloth/blender/release/datafiles/preview.blend
===================================================================
(Binary files differ)
Modified: branches/cloth/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2007-11-26 22:53:05 UTC (rev 12683)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2007-11-26 23:11:07 UTC (rev 12684)
@@ -70,6 +70,7 @@
CustomData vertData, edgeData, faceData;
int numVertData, numEdgeData, numFaceData;
int needsFree; /* checked on ->release, is set to 0 for cached results */
+ int deformedOnly; /* set by modifier stack if only deformed from original */
/* Misc. Queries */
Modified: branches/cloth/blender/source/blender/blenkernel/BKE_bad_level_calls.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_bad_level_calls.h 2007-11-26 22:53:05 UTC (rev 12683)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_bad_level_calls.h 2007-11-26 23:11:07 UTC (rev 12684)
@@ -231,5 +231,12 @@
void harmonic_coordinates_bind(struct MeshDeformModifierData *mmd,
float (*vertexcos)[3], int totvert, float cagemat[][4]);
+/* particle.c */
+struct ParticleSystem;
+
+void PE_free_particle_edit(struct ParticleSystem *psys);
+void PE_get_colors(char sel[4], char nosel[4]);
+void PE_recalc_world_cos(struct Object *ob, struct ParticleSystem *psys);
+
#endif
Modified: branches/cloth/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_blender.h 2007-11-26 22:53:05 UTC (rev 12683)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_blender.h 2007-11-26 23:11:07 UTC (rev 12684)
@@ -44,7 +44,7 @@
struct MemFile;
#define BLENDER_VERSION 245
-#define BLENDER_SUBVERSION 7
+#define BLENDER_SUBVERSION 8
#define BLENDER_MINVERSION 240
#define BLENDER_MINSUBVERSION 0
Modified: branches/cloth/blender/source/blender/blenkernel/BKE_cloth.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_cloth.h 2007-11-26 22:53:05 UTC (rev 12683)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_cloth.h 2007-11-26 23:11:07 UTC (rev 12684)
@@ -34,16 +34,20 @@
#ifndef BKE_CLOTH_H
#define BKE_CLOTH_H
+#include "BKE_customdata.h"
#include "BLI_linklist.h"
#include "BKE_DerivedMesh.h"
+#include "BKE_object.h"
+
+#include "DNA_cloth_types.h"
#include "DNA_customdata_types.h"
-#include "BKE_customdata.h"
#include "DNA_meshdata_types.h"
struct Object;
struct Cloth;
struct MFace;
struct DerivedMesh;
+struct ClothModifierData;
// this is needed for inlining behaviour
@@ -162,17 +166,17 @@
// needed for buttons_object.c
-void cloth_clear_cache(Object *ob, ClothModifierData *clmd, float framenr);
-void cloth_free_modifier ( ClothModifierData *clmd );
+void cloth_clear_cache(struct Object *ob, struct ClothModifierData *clmd, float framenr);
+void cloth_free_modifier ( struct ClothModifierData *clmd );
// needed for cloth.c
-void implicit_set_positions ( ClothModifierData *clmd );
+void implicit_set_positions ( struct ClothModifierData *clmd );
// from cloth.c, needed for modifier.c
-DerivedMesh *clothModifier_do(ClothModifierData *clmd,Object *ob, DerivedMesh *dm, int useRenderParams, int isFinalCalc);
+DerivedMesh *clothModifier_do(struct ClothModifierData *clmd, struct Object *ob, struct DerivedMesh *dm, int useRenderParams, int isFinalCalc);
// needed in implicit.c
-int cloth_bvh_objcollision(ClothModifierData * clmd, float step, float prevstep, float dt);
+int cloth_bvh_objcollision(struct ClothModifierData *clmd, float step, float prevstep, float dt);
////////////////////////////////////////////////
@@ -180,13 +184,13 @@
/////////////////////////////////////////////////
// cloth.c
////////////////////////////////////////////////
-void cloth_free_modifier ( ClothModifierData *clmd );
-void cloth_init ( ClothModifierData *clmd );
+void cloth_free_modifier ( struct ClothModifierData *clmd );
+void cloth_init ( struct ClothModifierData *clmd );
////////////////////////////////////////////////
/* Typedefs for function pointers we need for solvers and collision detection. */
-typedef void ( *CM_COLLISION_SELF ) ( ClothModifierData *clmd, int step );
+typedef void ( *CM_COLLISION_SELF ) ( struct ClothModifierData *clmd, int step );
// typedef void ( *CM_COLLISION_OBJ ) ( ClothModifierData *clmd, int step, CM_COLLISION_RESPONSE collision_response );
@@ -204,22 +208,22 @@
{
char *name;
CM_SOLVER_ID id;
- int ( *init ) ( Object *ob, ClothModifierData *clmd );
- int ( *solver ) ( Object *ob, float framenr, ClothModifierData *clmd, ListBase *effectors );
- int ( *free ) ( ClothModifierData *clmd );
+ int ( *init ) ( struct Object *ob, struct ClothModifierData *clmd );
+ int ( *solver ) ( struct Object *ob, float framenr, struct ClothModifierData *clmd, struct ListBase *effectors );
+ int ( *free ) ( struct ClothModifierData *clmd );
}
CM_SOLVER_DEF;
/* new C implicit simulator */
-int implicit_init ( Object *ob, ClothModifierData *clmd );
-int implicit_free ( ClothModifierData *clmd );
-int implicit_solver ( Object *ob, float frame, ClothModifierData *clmd, ListBase *effectors );
+int implicit_init ( struct Object *ob, struct ClothModifierData *clmd );
+int implicit_free ( struct ClothModifierData *clmd );
+int implicit_solver ( struct Object *ob, float frame, struct ClothModifierData *clmd, struct ListBase *effectors );
/* explicit verlet simulator */
-int verlet_init ( Object *ob, ClothModifierData *clmd );
-int verlet_free ( ClothModifierData *clmd );
-int verlet_solver ( Object *ob, float frame, ClothModifierData *clmd, ListBase *effectors );
+int verlet_init ( struct Object *ob, struct ClothModifierData *clmd );
+int verlet_free ( struct ClothModifierData *clmd );
+int verlet_solver ( struct Object *ob, float frame, struct ClothModifierData *clmd, struct ListBase *effectors );
/* used for collisions in collision.c */
Modified: branches/cloth/blender/source/blender/blenkernel/BKE_displist.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_displist.h 2007-11-26 22:53:05 UTC (rev 12683)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_displist.h 2007-11-26 23:11:07 UTC (rev 12684)
@@ -123,5 +123,7 @@
void fastshade_free_render(void);
+float calc_taper(struct Object *taperobj, int cur, int tot);
+
#endif
Modified: branches/cloth/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_global.h 2007-11-26 22:53:05 UTC (rev 12683)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_global.h 2007-11-26 23:11:07 UTC (rev 12684)
@@ -187,6 +187,7 @@
/*#endif*/
#define G_DRAWSHARP (1 << 28) /* draw edges with the sharp flag */
#define G_SCULPTMODE (1 << 29)
+#define G_PARTICLEEDIT (1 << 30)
#define G_AUTOMATKEYS (1 << 30)
#define G_HIDDENHANDLES (1 << 31) /* used for curves only */
@@ -243,9 +244,10 @@
#define B_ENDIAN 0
/* G.moving, signals drawing in (3d) window to denote transform */
-#define G_TRANSFORM_OBJ 1
-#define G_TRANSFORM_EDIT 2
-#define G_TRANSFORM_MANIP 4
+#define G_TRANSFORM_OBJ 1
+#define G_TRANSFORM_EDIT 2
+#define G_TRANSFORM_MANIP 4
+#define G_TRANSFORM_PARTICLE 8
/* G.special1 */
Modified: branches/cloth/blender/source/blender/blenkernel/BKE_main.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_main.h 2007-11-26 22:53:05 UTC (rev 12683)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_main.h 2007-11-26 23:11:07 UTC (rev 12684)
@@ -78,6 +78,7 @@
ListBase action;
ListBase nodetree;
ListBase brush;
+ ListBase particle;
} Main;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list