diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-05 12:02:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-05 12:02:04 +0400 |
| commit | 5c26223106cd659d59f430752a904ec40d51d1eb (patch) | |
| tree | df51b9bb3c4beabdea402b5b36ec1a9e642437d5 /source/blender/modifiers | |
| parent | e3ca29e2bf79553a7a1d334313bc04f37e83ec5e (diff) | |
| parent | d4909c56285a68562e8763f2f2fe40ec5c5297fe (diff) | |
svn merge -r38804:38971 https://svn.blender.org/svnroot/bf-blender/trunk/blender, manual merge of source/blender/editors/transform/transform.c
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_uvproject.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index afa914e869c..9e0d21e41fa 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -42,6 +42,7 @@ #include "DNA_object_types.h" #include "BLI_math.h" +#include "BLI_string.h" #include "BLI_uvproject.h" #include "BLI_utildefines.h" @@ -83,6 +84,7 @@ static void copyData(ModifierData *md, ModifierData *target) tumd->aspecty = umd->aspecty; tumd->scalex = umd->scalex; tumd->scaley = umd->scaley; + BLI_strncpy(tumd->uvlayer_name, umd->uvlayer_name, sizeof(umd->uvlayer_name)); } static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(md)) |