diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-11-27 01:09:57 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-11-27 01:09:57 +0300 |
commit | 7da56f4a9ba0bdd0cdcd40b8ca6e69d776d26abe (patch) | |
tree | 663c13aae5606937571ac1e7a4c77ca2866e75dd /source/blender/src/editview.c | |
parent | 121dab1bcd9467bd8e11d0a82e83a1621758fd8e (diff) | |
parent | 770291b9ea1ec03d98b6bae4fd2a2d3f0091be41 (diff) |
Particles
=========
Merge of the famous particle patch by Janne Karhu, a full rewrite
of the Blender particle system. This includes:
- Emitter, Hair and Reactor particle types.
- Newtonian, Keyed and Boids physics.
- Various particle visualisation and rendering types.
- Vertex group and texture control for various properties.
- Interpolated child particles from parents.
- Hair editing with combing, growing, cutting, .. .
- Explode modifier.
- Harmonic, Magnetic fields, and multiple falloff types.
.. and lots of other things, some more info is here:
http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite
http://wiki.blender.org/index.php/BlenderDev/Particles_Rewrite_Doc
The new particle system cannot be backwards compatible. Old particle
systems are being converted to the new system, but will require
tweaking to get them looking the same as before.
Point Cache
===========
The new system to replace manual baking, based on automatic caching
on disk. This is currently used by softbodies and the particle system.
See the Cache API section on:
http://wiki.blender.org/index.php/BlenderDev/PhysicsSprint
Documentation
=============
These new features still need good docs for the release logs, help
for this is appreciated.
Diffstat (limited to 'source/blender/src/editview.c')
-rw-r--r-- | source/blender/src/editview.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c index 5a141bcfcf5..f1e4017c264 100644 --- a/source/blender/src/editview.c +++ b/source/blender/src/editview.c @@ -73,6 +73,7 @@ #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_object.h" /* fly mode where_is_object to get camera location */ +#include "BKE_particle.h" #include "BKE_utildefines.h" #include "BKE_customdata.h" @@ -80,6 +81,7 @@ #include "BIF_butspace.h" #include "BIF_editaction.h" #include "BIF_editarmature.h" +#include "BIF_editparticle.h" #include "BIF_editgroup.h" #include "BIF_editmesh.h" #include "BIF_editoops.h" @@ -248,7 +250,7 @@ static int edge_inside_rect(rcti *rect, short x1, short y1, short x2, short y2) #define MOVES_GESTURE 50 #define MOVES_LASSO 500 -static int lasso_inside(short mcords[][2], short moves, short sx, short sy) +int lasso_inside(short mcords[][2], short moves, short sx, short sy) { /* we do the angle rule, define that all added angles should be about zero or 2*PI */ float angletot=0.0, len, dot, ang, cross, fp1[2], fp2[2]; @@ -641,6 +643,8 @@ static void do_lasso_select(short mcords[][2], short moves, short select) do_lasso_select_facemode(mcords, moves, select); else if(G.f & (G_VERTEXPAINT|G_TEXTUREPAINT|G_WEIGHTPAINT)) ; + else if(G.f & G_PARTICLEEDIT) + PE_do_lasso_select(mcords, moves, select); else do_lasso_select_objects(mcords, moves, select); } @@ -1161,18 +1165,8 @@ void set_active_base(Base *base) Base *tbase; /* activating a non-mesh, should end a couple of modes... */ - if(base) { - if(base->object->type!=OB_MESH) { - if(G.f & G_SCULPTMODE) - set_sculptmode(); /* toggle */ - if(G.f & G_WEIGHTPAINT) - set_wpaint(); /* toggle */ - if(G.f & G_VERTEXPAINT) - set_vpaint(); /* toggle */ - if(G.f & G_TEXTUREPAINT) - set_texturepaint(); /* Switch off tex paint */ - } - } + if(base && base->object->type!=OB_MESH) + exit_paint_modes(); /* sets scene->basact */ BASACT= base; @@ -1745,6 +1739,10 @@ void borderselect(void) face_borderselect(); return; } + else if(G.obedit==NULL && (G.f & G_PARTICLEEDIT)) { + PE_borderselect(); + return; + } a = 0; #ifdef __APPLE__ |