diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
| commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
| tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /extern/libmv/intern/image.cc | |
| parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
| parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) | |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'extern/libmv/intern/image.cc')
| -rw-r--r-- | extern/libmv/intern/image.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/libmv/intern/image.cc b/extern/libmv/intern/image.cc index df9a01ee8de..5018caef5b1 100644 --- a/extern/libmv/intern/image.cc +++ b/extern/libmv/intern/image.cc @@ -34,7 +34,7 @@ using libmv::FloatImage; using libmv::SamplePlanarPatch; -void libmv_floatImaheDestroy(libmv_FloatImage *image) { +void libmv_floatImageDestroy(libmv_FloatImage *image) { delete [] image->buffer; } |