diff options
author | Joseph Eagar <joeedh@gmail.com> | 2009-05-23 07:24:15 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2009-05-23 07:24:15 +0400 |
commit | f026266e185f90543138a856898f50b2295a12fc (patch) | |
tree | f674a1a1b328a423ec4bdcdc4a11f35e56669e7a /source/blender/editors/uvedit/uvedit_parametrizer.h | |
parent | b7fe3258b66698f62f630d0b18431b54b65101ed (diff) |
merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.
[[Split portion of a mixed commit.]]
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_parametrizer.h')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_parametrizer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h index c468b8d62c5..f1454ee3865 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.h +++ b/source/blender/editors/uvedit/uvedit_parametrizer.h @@ -73,7 +73,7 @@ void param_smooth_area(ParamHandle *handle); /* Packing */ -void param_pack(ParamHandle *handle); +void param_pack(ParamHandle *handle, float margin); /* Average area for all charts */ |