diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-11 22:32:47 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-11 22:59:50 +0300 |
commit | 2c9c22df26dfdcf03bb308fdf35294ed79c2d0e5 (patch) | |
tree | bafd0995f9329e90c4afd96787f450348592c8cd /source/blender/collada/GeometryExporter.cpp | |
parent | 49a7cd1ba4e43607aa42a26222beef353c528bac (diff) |
fix Collada: wrong usage of pointer and hidden redeclaration
* Suspicious usage of pointer:
short *type = 0; // this creates a null pointer
When this is later used for anything then blender would crash.
After following the code and check what happens i strongly believe
the author wanted to use a short and not a pointer to a short here.
* local variable where reused later in same function
While this did no harm, i still felt it was better to use a different
name here to make things more separated:
- moved variable declaraiotns into loop (for int a=0; ...)
- renamed uv_images to uv_image_set
- renamed index variable from i to j in inner loop that
reused same index name from outer loop
Diffstat (limited to 'source/blender/collada/GeometryExporter.cpp')
-rw-r--r-- | source/blender/collada/GeometryExporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index 73b00fd07ec..bc0275001d3 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -149,8 +149,8 @@ void GeometryExporter::operator()(Object *ob) } else { bool all_uv_layers = !this->export_settings->active_uv_only; - std::set<Image *> uv_images = bc_getUVImages(ob, all_uv_layers); - createPolylists(uv_images, has_uvs, has_color, ob, me, geom_id, norind); + std::set<Image *> uv_image_set = bc_getUVImages(ob, all_uv_layers); + createPolylists(uv_image_set, has_uvs, has_color, ob, me, geom_id, norind); } } |