diff options
author | Ton Roosendaal <ton@blender.org> | 2009-01-24 16:45:24 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-01-24 16:45:24 +0300 |
commit | 0ac35ca7c185f8e8f462b4ec06ad28c7f136e82e (patch) | |
tree | 5e49e7467bdb7d54f8b7aeaa4a14c2b89a2007ac /source/blender/blenkernel/intern | |
parent | e71d531238bf998f0ee5b06561462c84b89cce0d (diff) |
2.5
- Brought back code for particle edit and fluidsim
- Sanitized code from globals and bad level calls,
so its ready to come back working.
- Fixed cirle selecting (Ckey now)
- Enabled undo for editmode curve, armature, particle
and lattice
(another commit following)
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/BME_conversions.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/effect.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/fluidsim.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 9 |
4 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/BME_conversions.c b/source/blender/blenkernel/intern/BME_conversions.c index 58bd4b59181..1e332bcf393 100644 --- a/source/blender/blenkernel/intern/BME_conversions.c +++ b/source/blender/blenkernel/intern/BME_conversions.c @@ -427,8 +427,9 @@ void BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td, EditMesh *em) { efa->f |= SELECT; } if(f->flag & ME_HIDE) efa->h= 1; - if((G.f & G_FACESELECT) && (efa->f & SELECT)) - ; //XXX EM_select_face(efa, 1); /* flush down */ + // XXX flag depricated + // if((G.f & G_FACESELECT) && (efa->f & SELECT)) + //XXX EM_select_face(efa, 1); /* flush down */ CustomData_em_copy_data(&bm->pdata, &em->fdata, f->data, &efa->data); BME_loops_to_corners(bm, &em->fdata, efa->data, f,numCol,numTex); } diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 6c959f2190e..d28d4206768 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -86,7 +86,6 @@ #ifndef DISABLE_ELBEEM #include "DNA_object_fluidsim.h" #include "LBM_fluidsim.h" -#include "elbeem.h" #include <zlib.h> #include <string.h> #endif // DISABLE_ELBEEM diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index 060f9208796..9eefd48cae4 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -52,7 +52,6 @@ // headers for fluidsim bobj meshes #include <stdlib.h> #include "LBM_fluidsim.h" -#include "elbeem.h" #include <zlib.h> #include <string.h> #include <stdio.h> diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 0973ed90c8b..4a4a8b2e5b7 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -84,7 +84,6 @@ #ifndef DISABLE_ELBEEM #include "DNA_object_fluidsim.h" #include "LBM_fluidsim.h" -#include "elbeem.h" #include <zlib.h> #include <string.h> @@ -1689,7 +1688,7 @@ static void initialize_all_particles(Object *ob, ParticleSystem *psys, ParticleS } } /* sets particle to the emitter surface with initial velocity & rotation */ -static void reset_particle(Scene *scene, ParticleData *pa, ParticleSystem *psys, ParticleSystemModifierData *psmd, Object *ob, +void reset_particle(Scene *scene, ParticleData *pa, ParticleSystem *psys, ParticleSystemModifierData *psmd, Object *ob, float dtime, float cfra, float *vg_vel, float *vg_tan, float *vg_rot) { ParticleSettings *part; @@ -4364,7 +4363,7 @@ static void particles_fluid_step(Scene *scene, Object *ob, ParticleSystem *psys, gzf = gzopen(filename, "rb"); if (!gzf) { snprintf(debugStrBuffer,256,"readFsPartData::error - Unable to open file for reading '%s' \n", filename); - //elbeemDebugOut(debugStrBuffer); + elbeemDebugOut(debugStrBuffer); return; } @@ -4424,7 +4423,9 @@ static void particles_fluid_step(Scene *scene, Object *ob, ParticleSystem *psys, totpart = psys->totpart = activeParts; snprintf(debugStrBuffer,256,"readFsPartData::done - particles:%d, active:%d, file:%d, mask:%d \n", psys->totpart,activeParts,fileParts,readMask); - elbeemDebugOut(debugStrBuffer); + // bad level call + // XXX elbeemDebugOut(debugStrBuffer); + } // fluid sim particles done } #endif // DISABLE_ELBEEM |