[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33632] trunk/blender: Fix for [#25185] Toggling hair dynamics without deleting cache leaves hair disattached when mesh animation is controlled by deformers - discussed with Jahka on IRC on Sat
Janne Karhu
jhkarh at gmail.com
Mon Dec 13 10:39:14 CET 2010
Revision: 33632
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33632
Author: jhk
Date: 2010-12-13 10:39:14 +0100 (Mon, 13 Dec 2010)
Log Message:
-----------
Fix for [#25185] Toggling hair dynamics without deleting cache leaves hair disattached when mesh animation is controlled by deformers - discussed with Jahka on IRC on Sat
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_particle.py
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
Modified: trunk/blender/release/scripts/ui/properties_particle.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_particle.py 2010-12-13 09:10:16 UTC (rev 33631)
+++ trunk/blender/release/scripts/ui/properties_particle.py 2010-12-13 09:39:14 UTC (rev 33632)
@@ -234,7 +234,7 @@
#part = psys.settings
cloth = psys.cloth.settings
- layout.enabled = psys.use_hair_dynamics
+ layout.enabled = psys.use_hair_dynamics and psys.point_cache.is_baked == False
split = layout.split()
@@ -274,12 +274,12 @@
phystype = psys.settings.physics_type
if phystype == 'NO' or phystype == 'KEYED':
return False
- return (psys.settings.type in ('EMITTER', 'REACTOR') or (psys.settings.type == 'HAIR' and psys.use_hair_dynamics)) and engine in cls.COMPAT_ENGINES
+ return (psys.settings.type in ('EMITTER', 'REACTOR') or (psys.settings.type == 'HAIR' and (psys.use_hair_dynamics or psys.point_cache.is_baked))) and engine in cls.COMPAT_ENGINES
def draw(self, context):
psys = context.particle_system
- point_cache_ui(self, context, psys.point_cache, True, 'HAIR' if psys.use_hair_dynamics else 'PSYS')
+ point_cache_ui(self, context, psys.point_cache, True, 'HAIR' if (psys.settings.type == 'HAIR') else 'PSYS')
class PARTICLE_PT_velocity(ParticleButtonsPanel, bpy.types.Panel):
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2010-12-13 09:10:16 UTC (rev 33631)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2010-12-13 09:39:14 UTC (rev 33632)
@@ -2795,7 +2795,7 @@
ParticleSettings *part = psys->part;
ParticleCacheKey *ca, **cache= psys->pathcache;
- DerivedMesh *hair_dm = psys->hair_out_dm;
+ DerivedMesh *hair_dm = (psys->part->type==PART_HAIR && psys->flag & PSYS_HAIR_DYNAMICS) ? psys->hair_out_dm : NULL;
ParticleKey result;
@@ -2828,7 +2828,7 @@
BLI_srandom(psys->seed);
keyed = psys->flag & PSYS_KEYED;
- baked = !hair_dm && psys->pointcache->mem_cache.first;
+ baked = psys->pointcache->mem_cache.first && psys->part->type != PART_HAIR;
/* clear out old and create new empty path cache */
psys_free_path_cache(psys, psys->edit);
Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_particle.c 2010-12-13 09:10:16 UTC (rev 33631)
+++ trunk/blender/source/blender/makesrna/intern/rna_particle.c 2010-12-13 09:39:14 UTC (rev 33632)
@@ -302,6 +302,7 @@
static void rna_Particle_hair_dynamics(Main *bmain, Scene *scene, PointerRNA *ptr)
{
+ Object *ob = (Object*)ptr->id.data;
ParticleSystem *psys = (ParticleSystem*)ptr->data;
if(psys && !psys->clmd) {
@@ -313,6 +314,8 @@
}
else
WM_main_add_notifier(NC_OBJECT|ND_PARTICLE|NA_EDITED, NULL);
+
+ DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
}
static PointerRNA rna_particle_settings_get(PointerRNA *ptr)
{
More information about the Bf-blender-cvs
mailing list