sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

New fix for [#29940] Stretch To constraint breaks scaling in Transform constraint, previous one caused bug [#29962] linked objects not correct on r4361, should be fixed now.

Browse Source 
Org code was working with isotropic scaling, but when scaling only one axis, it was broken. First fix just disabled completly scale handling. This version only takes into account scaling along local Y axis, as this is the only one affecting that constraint!

Sorry for the mistake, hope this time it will be ok.
This commit is contained in:
Bastien Montagne 2012-01-24 13:17:32 +00:00
parent 1c33126cf5
commit 925234f1e0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenkernel/intern/constraint.c
View File

@ -2775,8 +2775,7 @@ static void stretchto_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *
/* store Z orientation before destroying obmat */
normalize_v3_v3(zz, cob->matrix[2]);
dist = len_v3v3(cob->matrix[3], ct->matrix[3]);
/* XXX What was all that for??? Makes the constraint buggy with scaled objects, see #29940. */
/* XXX That makes the constraint buggy with asymmetrically scaled objects, see #29940. */
/* sub_v3_v3v3(vec, cob->matrix[3], ct->matrix[3]);*/
/* vec[0] /= size[0];*/
/* vec[1] /= size[1];*/
@ -2784,10 +2783,14 @@ static void stretchto_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *
/* dist = normalize_v3(vec);*/
dist = len_v3v3(cob->matrix[3], ct->matrix[3]);
/* Only Y constrained object axis scale should be used, to keep same length when scaling it. */
dist /= size[1];
/* data->orglength==0 occurs on first run, and after 'R' button is clicked */
if (data->orglength == 0)
if (data->orglength == 0)
data->orglength = dist;
if (data->bulge == 0)
if (data->bulge == 0)
data->bulge = 1.0;
scale[1] = dist/data->orglength;

2
source/blender/makesrna/intern/rna_scene.c
View File

@ -3722,7 +3722,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
prop= RNA_def_property(srna, "use_simplify_triangulate", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "simplify_flag", R_SIMPLE_NO_TRIANGULATE);
RNA_def_property_ui_text(prop, "Skip Quad to Triangles", "Disable non-planer quads being triangulated");
RNA_def_property_ui_text(prop, "Skip Quad to Triangles", "Disable non-planar quads being triangulated");
/* Scene API */
RNA_api_scene_render(srna);