Revision: 23118
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23118
Author: jhk
Date: 2009-09-11 02:23:08 +0200 (Fri, 11 Sep 2009)
Log Message:
-----------
Disconnect hair was using wrong derived mesh for the space conversion.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_ops.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_ops.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_ops.c
2009-09-10 23:46:42 UTC (rev 23117)
+++
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_ops.c
2009-09-11 00:23:08 UTC (rev 23118)
@@ -729,7 +729,6 @@
PTCacheEdit *edit = psys->edit;
PTCacheEditPoint *point = edit ? edit->points : NULL;
PTCacheEditKey *ekey = NULL;
- DerivedMesh *dm = NULL;
HairKey *key;
int i, k;
float hairmat[4][4];
@@ -740,18 +739,13 @@
if(!psys->part || psys->part->type != PART_HAIR)
return;
- if(psmd->dm->deformedOnly)
- dm= psmd->dm;
- else
- dm= mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH);
-
for(i=0; i<psys->totpart; i++,pa++) {
if(point) {
ekey = point->keys;
point++;
}
- psys_mat_hair_to_global(ob, dm, psys->part->from, pa, hairmat);
+ psys_mat_hair_to_global(ob, psmd->dm, psys->part->from, pa,
hairmat);
for(k=0,key=pa->hair; k<pa->totkey; k++,key++) {
Mat4MulVecfl(hairmat,key->co);
@@ -765,9 +759,6 @@
psys_free_path_cache(psys, psys->edit);
- if(!psmd->dm->deformedOnly)
- dm->release(dm);
-
psys->flag |= PSYS_GLOBAL_HAIR;
PE_update_object(scene, ob, 0);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
