[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53786] trunk/blender/source/blender/ makesrna/intern/rna_particle.c: Fix cycles hair in a dupligroup not showing in the correct location for viewport
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Jan 14 14:05:09 CET 2013
Revision: 53786
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53786
Author: blendix
Date: 2013-01-14 13:05:01 +0000 (Mon, 14 Jan 2013)
Log Message:
-----------
Fix cycles hair in a dupligroup not showing in the correct location for viewport
rendering.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_particle.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_particle.c 2013-01-14 12:14:08 UTC (rev 53785)
+++ trunk/blender/source/blender/makesrna/intern/rna_particle.c 2013-01-14 13:05:01 UTC (rev 53786)
@@ -349,8 +349,11 @@
/*strands key loop data stored in cache + step->co*/
if (path_nbr) {
if (step >= 0 && step <= path_nbr) {
- if (step <= max_k)
+ if (step <= max_k) {
copy_v3_v3(n_co, (cache + step)->co);
+ mul_m4_v3(particlesystem->imat, n_co);
+ mul_m4_v3(object->obmat, n_co);
+ }
}
}
@@ -1246,10 +1249,10 @@
RNA_def_property_float_funcs(prop, "rna_ParticleHairKey_location_object_get",
"rna_ParticleHairKey_location_object_set", NULL);
- prop = RNA_def_property(srna, "co_hair_space", PROP_FLOAT, PROP_TRANSLATION);
+ prop = RNA_def_property(srna, "co_local", PROP_FLOAT, PROP_TRANSLATION);
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, "
+ "Location of the hair key in its local coordinate system, "
"relative to the emitting face");
/* Aided co func */
More information about the Bf-blender-cvs
mailing list