diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-06-21 16:14:42 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-06-21 16:14:42 +0300 |
| commit | 4ceb006706579a0ad2301d2cde57489b69a7683c (patch) | |
| tree | 3825806212dd3d3e5f8a44a16b9b82cfe8142c81 /source/blender/modifiers/intern/MOD_uvproject.c | |
| parent | 2ae172ec32da4a1aacd268bdba45bf82cff7eea9 (diff) | |
| parent | 22466a5bdff73afb6ad3afd408e265517e4f3733 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_uvproject.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_uvproject.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 362df031f92..cae83282238 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -45,6 +45,7 @@ #include "BKE_camera.h" +#include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_material.h" #include "BKE_mesh.h" @@ -70,9 +71,12 @@ static void copyData(ModifierData *md, ModifierData *target) { #if 0 UVProjectModifierData *umd = (UVProjectModifierData *) md; - UVProjectModifierData *tumd = (UVProjectModifierData *) target; #endif + UVProjectModifierData *tumd = (UVProjectModifierData *) target; + modifier_copyData_generic(md, target); + + id_us_plus((ID *)tumd->image); } static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(md)) |