Particles: child editing bugfixes

* Make partial update work again for faster editing.
* Draw parents over children again, nicer for editing.
* Fix crash with remove tools & showing child particles.
* Fix children not disappearing always when setting to None.
* Fix wrong normal for last point in child path.
* Fix a python error in the hair dynamics panel.

diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py
index d95455f7c10595722deefed083c708d78f27644e..3577ba961b3368f7011a773474843b67fbb94e53 100644 (file)
--- a/release/scripts/ui/properties_particle.py
+++ b/release/scripts/ui/properties_particle.py
@@ -208,6 +208,10 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel):
         layout = self.layout
 
         psys = context.particle_system
+
+        if not psys.cloth:
+            return
+
         #part = psys.settings
         cloth = psys.cloth.settings
 
@@ -298,8 +302,8 @@ class PARTICLE_PT_velocity(ParticleButtonsPanel):
         sub.prop(part, "random_factor")
 
         #if part.type=='REACTOR':
-        #      sub.prop(part, "reactor_factor")
-        #      sub.prop(part, "reaction_shape", slider=True)
+        #    sub.prop(part, "reactor_factor")
+        #    sub.prop(part, "reaction_shape", slider=True)
 
 
 class PARTICLE_PT_rotation(ParticleButtonsPanel):

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index bb2f41288911b8fda9fc74ca6203ba54145e2567..ab73b24ba396ee38ad88004fe2c897e5b0c2282b 100644 (file)
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2332,6 +2332,7 @@ static int psys_threads_init_path(ParticleThread *threads, Scene *scene, float c
        ctx->totparent= totparent;
        ctx->parent_pass= 0;
        ctx->cfra= cfra;
+       ctx->editupdate= editupdate;
 
        psys->lattice = psys_get_lattice(&ctx->sim);
 
@@ -2615,6 +2616,9 @@ static void psys_thread_create_path(ParticleThread *thread, struct ChildParticle
                                get_strand_normal(ctx->ma, ornor, cur_length, (state-1)->vel);
                }
 
+               if(k == ctx->steps)
+                       VECSUB(state->vel,state->co,(state-1)->co);
+
                /* check if path needs to be cut before actual end of data points */
                if(k){
                        VECSUB(dvec,state->co,(state-1)->co);

diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index dbe6fbd6ddefc2bf0e12e20a1941c6f5f4196186..3c660be64cee24e5e01484788e28224238e5eec1 100644 (file)
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -2925,6 +2925,8 @@ static void psys_update_path_cache(ParticleSimulationData *sim, float cfra)
                                        psys_find_parents(sim);
                        }
                }
+               else
+                       psys_free_children(psys);
        }
 
        if((part->type==PART_HAIR || psys->flag&PSYS_KEYED || psys->pointcache->flag & PTCACHE_BAKED)==0)

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 2ad3b17a896ef1de83732e51c744fb22b1e840da..54c86af80b6ce94526db1db1cb18cb8944c9eb79 100644 (file)
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10165,7 +10165,13 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
        }
        
        /* put 2.50 compatibility code here until next subversion bump */
-       
+       {
+               Scene *sce= main->scene.first;
+
+               for(sce=main->scene.first; sce; sce=sce->id.next)
+                       if(!sce->toolsettings->particle.selectmode)
+                               sce->toolsettings->particle.selectmode= SCE_SELECT_PATH;
+       }
 
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! */
        /* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */

diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 68e673c31b17eda639fca93bcad4dcfa7db2c402..349db7746a13e10a73377d1749854407ba53fca8 100644 (file)
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -1174,8 +1174,11 @@ static void update_velocities(Object *ob, PTCacheEdit *edit)
                }
        }
 }
+
 void PE_update_object(Scene *scene, Object *ob, int useflag)
 {
+       /* use this to do partial particle updates, not usable when adding or
+          removing, then a full redo is necessary and calling this may crash */
        ParticleEditSettings *pset= PE_settings(scene);
        PTCacheEdit *edit = PE_get_current(scene, ob);
        POINT_P;
@@ -2064,6 +2067,12 @@ static int remove_tagged_particles(Scene *scene, Object *ob, ParticleSystem *psy
                        edit->mirror_cache= NULL;
                }
 
+               if(psys->child) {
+                       MEM_freeN(psys->child);
+                       psys->child= NULL;
+                       psys->totchild=0;
+               }
+
                edit->totpoint= psys->totpart= new_totpart;
        }
 
@@ -2330,7 +2339,6 @@ static int remove_doubles_exec(bContext *C, wmOperator *op)
 
        BKE_reportf(op->reports, RPT_INFO, "Remove %d double particles.", totremoved);
 
-       PE_update_object(scene, ob, 0);
        DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, ob);
 
@@ -2507,7 +2515,6 @@ static int delete_exec(bContext *C, wmOperator *op)
                recalc_lengths(data.edit);
        }
 
-       PE_update_object(data.scene, data.ob, 0);
        DAG_id_flush_update(&data.ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, data.ob);
 
@@ -3733,7 +3740,6 @@ void PE_undo_step(Scene *scene, int step)
                }
        }
 
-       PE_update_object(scene, OBACT, 0);
        DAG_id_flush_update(&OBACT->id, OB_RECALC_DATA);
 }
 

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index f60f4ad9230cb375dca17b9ead0a38fe46467d0e..7bc86f6bae71270fc906d471d66b870ad6078987 100644 (file)
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -4166,6 +4166,16 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv
                wmLoadMatrix(rv3d->viewmat);
 }
 
+static void draw_update_ptcache_edit(Scene *scene, Object *ob, PTCacheEdit *edit)
+{
+       if(edit->psys && edit->psys->flag & PSYS_HAIR_UPDATED)
+               PE_update_object(scene, ob, 0);
+
+       /* create path and child path cache if it doesn't exist already */
+       if(edit->pathcache==0)
+               psys_cache_edit_paths(scene, ob, edit, CFRA);
+}
+
 static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, PTCacheEdit *edit, int dt)
 {
        ParticleCacheKey **cache, *path, *pkey;
@@ -4178,14 +4188,6 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Obj
        float nosel_col[3];
        float *pathcol = NULL, *pcol;
 
-
-       if(edit->psys && edit->psys->flag & PSYS_HAIR_UPDATED)
-               PE_update_object(scene, ob, 0);
-
-       /* create path and child path cache if it doesn't exist already */
-       if(edit->pathcache==0)
-               psys_cache_edit_paths(scene, ob, edit, CFRA);
-
        if(edit->pathcache==0)
                return;
 
@@ -5900,22 +5902,6 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 
        if(ob->pd && ob->pd->forcefield) draw_forcefield(scene, ob);
 
-       /* particle mode has to be drawn first so that possible child particles get cached in edit mode */
-       if(             (warning_recursive==0) &&
-                       (flag & DRAW_PICKING)==0 &&
-                       (!scene->obedit)        
-         ) {
-
-               if(ob->mode & OB_MODE_PARTICLE_EDIT && ob==OBACT) {
-                       PTCacheEdit *edit = PE_get_current(scene, ob);
-                       if(edit) {
-                               wmLoadMatrix(rv3d->viewmat);
-                               draw_ptcache_edit(scene, v3d, rv3d, ob, edit, dt);
-                               wmMultMatrix(ob->obmat);
-                       }
-               }
-       }
-
        /* code for new particle system */
        if(             (warning_recursive==0) &&
                        (ob->particlesystem.first) &&
@@ -5923,6 +5909,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                        (ob!=scene->obedit)     
          ) {
                ParticleSystem *psys;
+               PTCacheEdit *edit = PE_get_current(scene, ob);
+
                if(col || (ob->flag & SELECT)) cpack(0xFFFFFF); /* for visibility, also while wpaint */
                //glDepthMask(GL_FALSE);
 
@@ -5930,8 +5918,13 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                
                view3d_cached_text_draw_begin();
 
-               for(psys=ob->particlesystem.first; psys; psys=psys->next)
+               for(psys=ob->particlesystem.first; psys; psys=psys->next) {
+                       /* run this so that possible child particles get cached */
+                       if(edit && edit->psys == psys)
+                               draw_update_ptcache_edit(scene, ob, edit);
+
                        draw_new_particle_system(scene, v3d, rv3d, base, psys, dt);
+               }
                
                view3d_cached_text_draw_end(v3d, ar, 0, NULL);
 
@@ -5941,6 +5934,22 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                if(col) cpack(col);
        }
 
+       /* draw edit particles last so that they can draw over child particles */
+       if(             (warning_recursive==0) &&
+                       (flag & DRAW_PICKING)==0 &&
+                       (!scene->obedit)        
+         ) {
+
+               if(ob->mode & OB_MODE_PARTICLE_EDIT && ob==OBACT) {
+                       PTCacheEdit *edit = PE_get_current(scene, ob);
+                       if(edit) {
+                               wmLoadMatrix(rv3d->viewmat);
+                               draw_ptcache_edit(scene, v3d, rv3d, ob, edit, dt);
+                               wmMultMatrix(ob->obmat);
+                       }
+               }
+       }
+
        /* draw code for smoke */
        if((md = modifiers_findByType(ob, eModifierType_Smoke)))
        {