forked from bartvdbraak/blender
Fix for [#26747] Crash accessing dynamic hair RNA
* Removed hairkey.co_dynamic. The hairkey access is now simplified so that hairkey.co are the dynamic coordinates whenever the hair is dynamic.
This commit is contained in:
parent
5b996e04d2
commit
36858f6342
@ -183,10 +183,18 @@ static void rna_ParticleHairKey_location_object_get(PointerRNA *ptr, float *valu
|
|||||||
rna_ParticleHairKey_location_object_info(ptr, &psmd, &pa);
|
rna_ParticleHairKey_location_object_info(ptr, &psmd, &pa);
|
||||||
|
|
||||||
if(pa) {
|
if(pa) {
|
||||||
float hairmat[4][4];
|
DerivedMesh *hairdm = (psmd->psys->flag & PSYS_HAIR_DYNAMICS) ? psmd->psys->hair_out_dm : NULL;
|
||||||
psys_mat_hair_to_object(ob, psmd->dm, psmd->psys->part->from, pa, hairmat);
|
|
||||||
copy_v3_v3(values, hkey->co);
|
if(hairdm) {
|
||||||
mul_m4_v3(hairmat, values);
|
MVert *mvert = CDDM_get_vert(hairdm, pa->hair_index + (hkey - pa->hair));
|
||||||
|
copy_v3_v3(values, mvert->co);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
float hairmat[4][4];
|
||||||
|
psys_mat_hair_to_object(ob, psmd->dm, psmd->psys->part->from, pa, hairmat);
|
||||||
|
copy_v3_v3(values, hkey->co);
|
||||||
|
mul_m4_v3(hairmat, values);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
zero_v3(values);
|
zero_v3(values);
|
||||||
@ -203,64 +211,20 @@ static void rna_ParticleHairKey_location_object_set(PointerRNA *ptr, const float
|
|||||||
rna_ParticleHairKey_location_object_info(ptr, &psmd, &pa);
|
rna_ParticleHairKey_location_object_info(ptr, &psmd, &pa);
|
||||||
|
|
||||||
if(pa) {
|
if(pa) {
|
||||||
float hairmat[4][4];
|
DerivedMesh *hairdm = (psmd->psys->flag & PSYS_HAIR_DYNAMICS) ? psmd->psys->hair_out_dm : NULL;
|
||||||
float imat[4][4];
|
|
||||||
|
|
||||||
psys_mat_hair_to_object(ob, psmd->dm, psmd->psys->part->from, pa, hairmat);
|
|
||||||
invert_m4_m4(imat, hairmat);
|
|
||||||
copy_v3_v3(hkey->co, values);
|
|
||||||
mul_m4_v3(imat, hkey->co);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
zero_v3(hkey->co);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void rna_ParticleHairKey_dynamic_location_object_get(PointerRNA *ptr, float *values)
|
|
||||||
{
|
|
||||||
HairKey *hkey= (HairKey *)ptr->data;
|
|
||||||
// Object *ob = (Object *)ptr->id.data;
|
|
||||||
ParticleSystemModifierData *psmd;
|
|
||||||
ParticleData *pa;
|
|
||||||
|
|
||||||
rna_ParticleHairKey_location_object_info(ptr, &psmd, &pa);
|
|
||||||
|
|
||||||
if(pa) {
|
|
||||||
ParticleSystem *psys = psmd->psys;
|
|
||||||
DerivedMesh *hairdm = (psys->flag & PSYS_HAIR_DYNAMICS) ? psys->hair_out_dm : NULL;
|
|
||||||
|
|
||||||
if(hairdm) {
|
|
||||||
MVert *mvert = CDDM_get_vert(hairdm, pa->hair_index + (hkey - pa->hair));
|
|
||||||
copy_v3_v3(values, mvert->co);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
rna_ParticleHairKey_dynamic_location_object_get(ptr, values);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
zero_v3(values);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void rna_ParticleHairKey_dynamic_location_object_set(PointerRNA *ptr, const float *values)
|
|
||||||
{
|
|
||||||
HairKey *hkey= (HairKey *)ptr->data;
|
|
||||||
// Object *ob = (Object *)ptr->id.data;
|
|
||||||
ParticleSystemModifierData *psmd;
|
|
||||||
ParticleData *pa;
|
|
||||||
|
|
||||||
rna_ParticleHairKey_location_object_info(ptr, &psmd, &pa);
|
|
||||||
|
|
||||||
if(pa) {
|
|
||||||
ParticleSystem *psys = psmd->psys;
|
|
||||||
DerivedMesh *hairdm = (psys->flag & PSYS_HAIR_DYNAMICS) ? psys->hair_out_dm : NULL;
|
|
||||||
|
|
||||||
if(hairdm) {
|
if(hairdm) {
|
||||||
MVert *mvert = CDDM_get_vert(hairdm, pa->hair_index + (hkey - pa->hair));
|
MVert *mvert = CDDM_get_vert(hairdm, pa->hair_index + (hkey - pa->hair));
|
||||||
copy_v3_v3(mvert->co, values);
|
copy_v3_v3(mvert->co, values);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
rna_ParticleHairKey_dynamic_location_object_set(ptr, values);
|
float hairmat[4][4];
|
||||||
|
float imat[4][4];
|
||||||
|
|
||||||
|
psys_mat_hair_to_object(ob, psmd->dm, psmd->psys->part->from, pa, hairmat);
|
||||||
|
invert_m4_m4(imat, hairmat);
|
||||||
|
copy_v3_v3(hkey->co, values);
|
||||||
|
mul_m4_v3(imat, hkey->co);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -941,11 +905,6 @@ static void rna_def_particle_hair_key(BlenderRNA *brna)
|
|||||||
prop= RNA_def_property(srna, "co_hair_space", PROP_FLOAT, PROP_TRANSLATION);
|
prop= RNA_def_property(srna, "co_hair_space", PROP_FLOAT, PROP_TRANSLATION);
|
||||||
RNA_def_property_float_sdna(prop, NULL, "co");
|
RNA_def_property_float_sdna(prop, NULL, "co");
|
||||||
RNA_def_property_ui_text(prop, "Location", "Location of the hair key in its internal coordinate system, relative to the emitting face");
|
RNA_def_property_ui_text(prop, "Location", "Location of the hair key in its internal coordinate system, relative to the emitting face");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "co_dynamic", PROP_FLOAT, PROP_TRANSLATION);
|
|
||||||
RNA_def_property_array(prop, 3);
|
|
||||||
RNA_def_property_ui_text(prop, "Location (Dynamic)", "Location of the hair key for the current frame with hair dynamics applied");
|
|
||||||
RNA_def_property_float_funcs(prop, "rna_ParticleHairKey_dynamic_location_object_get", "rna_ParticleHairKey_dynamic_location_object_set", NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rna_def_particle_key(BlenderRNA *brna)
|
static void rna_def_particle_key(BlenderRNA *brna)
|
||||||
|
Loading…
Reference in New Issue
Block a user