archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup: also some typos

Browse Source
This commit is contained in:
Campbell Barton
2013-02-11 00:49:00 +00:00
parent 22dbb675c1
commit 2005f7c6c0
23 changed files with 56 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/collada/collada_utils.cpp
View File

@@ -329,15 +329,18 @@ void bc_match_scale(std::vector<Object *> *objects_done,
float bl_scale;
switch(type) {
case USER_UNIT_NONE : bl_scale = 1.0; // map 1 Blender unit to 1 Meter
break;
case USER_UNIT_METRIC : bl_scale = RNA_property_float_get(&unit_settings, scale_ptr);
break;
default : bl_scale = RNA_property_float_get(&unit_settings, scale_ptr);
// it looks like the conversion to Imperial is done implicitly.
// So nothing to do here.
break;
switch (type) {
case USER_UNIT_NONE:
bl_scale = 1.0; // map 1 Blender unit to 1 Meter
break;
case USER_UNIT_METRIC:
bl_scale = RNA_property_float_get(&unit_settings, scale_ptr);
break;
default:
bl_scale = RNA_property_float_get(&unit_settings, scale_ptr);
// it looks like the conversion to Imperial is done implicitly.
// So nothing to do here.
break;
}
float size_mat3[3][3];