From c819fd4ee0b935dd88f2b516c4d49332af447f03 Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Thu, 3 Oct 2013 14:24:54 +0000 Subject: Changed some labels from Second Life to OpenSim --- source/blender/collada/AnimationExporter.cpp | 4 ++-- source/blender/collada/ArmatureExporter.cpp | 8 ++++---- source/blender/collada/ControllerExporter.cpp | 4 ++-- source/blender/collada/ExportSettings.h | 2 +- source/blender/collada/collada.cpp | 4 ++-- source/blender/collada/collada.h | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index bcbcdd42752..c1b6dc83139 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -963,10 +963,10 @@ std::string AnimationExporter::create_4x4_source(std::vector &frames, Obj else copy_m4_m4(mat, pchan->pose_mat); - // SECOND_LIFE_COMPATIBILITY + // OPEN_SIM_COMPATIBILITY // AFAIK animation to second life is via BVH, but no // reason to not have the collada-animation be correct - if (export_settings->second_life) { + if (export_settings->open_sim) { float temp[4][4]; copy_m4_m4(temp, bone->arm_mat); temp[3][0] = temp[3][1] = temp[3][2] = 0.0f; diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/collada/ArmatureExporter.cpp index 438421ccd14..174331c4644 100644 --- a/source/blender/collada/ArmatureExporter.cpp +++ b/source/blender/collada/ArmatureExporter.cpp @@ -193,11 +193,11 @@ void ArmatureExporter::add_bone_node(Bone *bone, Object *ob_arm, Scene *sce, // and not it's head, seems arbitrary. (*i)->parentinv[3][1] += bone->length; - // SECOND_LIFE_COMPATIBILITY + // OPEN_SIM_COMPATIBILITY // TODO: when such objects are animated as // single matrix the tweak must be applied // to the result. - if (export_settings->second_life) { + if (export_settings->open_sim) { // tweak objects parentinverse to match compatibility float temp[4][4]; @@ -272,8 +272,8 @@ void ArmatureExporter::add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW: copy_m4_m4(mat, bone->arm_mat); } - // SECOND_LIFE_COMPATIBILITY - if (export_settings->second_life) { + // OPEN_SIM_COMPATIBILITY + if (export_settings->open_sim) { // Remove rotations vs armature from transform // parent_rest_rot * mat * irest_rot float temp[4][4]; diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index d04ed8d6fa1..948a3dc5ae1 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -507,8 +507,8 @@ std::string ControllerExporter::add_inv_bind_mats_source(Object *ob_arm, ListBas float world[4][4]; float inv_bind_mat[4][4]; - // SECOND_LIFE_COMPATIBILITY - if (export_settings->second_life) { + // OPEN_SIM_COMPATIBILITY + if (export_settings->open_sim) { // Only translations, no rotation vs armature float temp[4][4]; unit_m4(temp); diff --git a/source/blender/collada/ExportSettings.h b/source/blender/collada/ExportSettings.h index f9eb4cbc26f..3dc7e74379e 100644 --- a/source/blender/collada/ExportSettings.h +++ b/source/blender/collada/ExportSettings.h @@ -50,7 +50,7 @@ public: bool use_object_instantiation; bool sort_by_name; BC_export_transformation_type export_transformation_type; - bool second_life; + bool open_sim; char *filepath; LinkNode *export_set; diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp index 85bbaf4748f..223ab3eca2a 100644 --- a/source/blender/collada/collada.cpp +++ b/source/blender/collada/collada.cpp @@ -79,7 +79,7 @@ int collada_export(Scene *sce, int use_object_instantiation, int sort_by_name, BC_export_transformation_type export_transformation_type, - int second_life) + int open_sim) { ExportSettings export_settings; @@ -102,7 +102,7 @@ int collada_export(Scene *sce, export_settings.use_object_instantiation = use_object_instantiation != 0; export_settings.sort_by_name = sort_by_name != 0; export_settings.export_transformation_type = export_transformation_type; - export_settings.second_life = second_life != 0; + export_settings.open_sim = open_sim != 0; int includeFilter = OB_REL_NONE; diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h index b3a8156b6fe..e96bc2ea8a4 100644 --- a/source/blender/collada/collada.h +++ b/source/blender/collada/collada.h @@ -77,7 +77,7 @@ int collada_export(Scene *sce, int use_object_instantiation, int sort_by_name, BC_export_transformation_type export_transformation_type, - int second_life); + int open_sim); -- cgit v1.2.3