diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-25 06:41:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-25 06:41:30 +0400 |
| commit | e1a54214bbed9b32e1aee0e849ae654c495afa80 (patch) | |
| tree | a95eaa2b98e7baa7e91fa34db46571e531b1cfb3 /source/blender/collada/collada_utils.cpp | |
| parent | 153eea5f23e2f0060d89a701ddd9b48085fc6070 (diff) | |
code cleanup:
- remove unused defines.
- quiet some shadow warnings.
- bevel, ifdef out some asserts that are too common.
- style
Diffstat (limited to 'source/blender/collada/collada_utils.cpp')
| -rw-r--r-- | source/blender/collada/collada_utils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 84b81f4d332..9aa1f7b9714 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -327,8 +327,8 @@ std::string bc_replace_string(std::string data, const std::string& pattern, */ void bc_match_scale(std::vector<Object *> *objects_done, Scene &sce, - UnitConverter &bc_unit) { - + UnitConverter &bc_unit) +{ Object *ob = NULL; PointerRNA scene_ptr, unit_settings; |