[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60530] trunk/blender: Changed some labels from Second Life to OpenSim
Gaia Clary
gaia.clary at machinimatrix.org
Thu Oct 3 16:24:55 CEST 2013
Revision: 60530
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60530
Author: gaiaclary
Date: 2013-10-03 14:24:54 +0000 (Thu, 03 Oct 2013)
Log Message:
-----------
Changed some labels from Second Life to OpenSim
Modified Paths:
--------------
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/ArmatureExporter.cpp
trunk/blender/source/blender/collada/ControllerExporter.cpp
trunk/blender/source/blender/collada/ExportSettings.h
trunk/blender/source/blender/collada/collada.cpp
trunk/blender/source/blender/collada/collada.h
trunk/blender/source/blender/editors/io/io_collada.c
trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
Added Paths:
-----------
trunk/blender/release/scripts/presets/operator/wm.collada_export/open_sim_rigged.py
trunk/blender/release/scripts/presets/operator/wm.collada_export/open_sim_static.py
Removed Paths:
-------------
trunk/blender/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py
trunk/blender/release/scripts/presets/operator/wm.collada_export/second_life_static.py
Copied: trunk/blender/release/scripts/presets/operator/wm.collada_export/open_sim_rigged.py (from rev 60402, trunk/blender/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py)
===================================================================
--- trunk/blender/release/scripts/presets/operator/wm.collada_export/open_sim_rigged.py (rev 0)
+++ trunk/blender/release/scripts/presets/operator/wm.collada_export/open_sim_rigged.py 2013-10-03 14:24:54 UTC (rev 60530)
@@ -0,0 +1,18 @@
+import bpy
+op = bpy.context.active_operator
+
+op.apply_modifiers = True
+op.export_mesh_type = 0
+op.export_mesh_type_selection = 'view'
+op.selected = True
+op.include_children = False
+op.include_armatures = True
+op.include_shapekeys = False
+op.deform_bones_only = True
+op.active_uv_only = True
+op.include_uv_textures = True
+op.use_texture_copies = True
+op.triangulate = True
+op.use_object_instantiation = False
+op.sort_by_name = True
+op.open_sim = True
Copied: trunk/blender/release/scripts/presets/operator/wm.collada_export/open_sim_static.py (from rev 60402, trunk/blender/release/scripts/presets/operator/wm.collada_export/second_life_static.py)
===================================================================
--- trunk/blender/release/scripts/presets/operator/wm.collada_export/open_sim_static.py (rev 0)
+++ trunk/blender/release/scripts/presets/operator/wm.collada_export/open_sim_static.py 2013-10-03 14:24:54 UTC (rev 60530)
@@ -0,0 +1,18 @@
+import bpy
+op = bpy.context.active_operator
+
+op.apply_modifiers = True
+op.export_mesh_type = 0
+op.export_mesh_type_selection = 'view'
+op.selected = True
+op.include_children = False
+op.include_armatures = False
+op.include_shapekeys = False
+op.deform_bones_only = False
+op.active_uv_only = True
+op.include_uv_textures = True
+op.use_texture_copies = True
+op.triangulate = True
+op.use_object_instantiation = False
+op.sort_by_name = True
+op.open_sim = False
Deleted: trunk/blender/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py
===================================================================
--- trunk/blender/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py 2013-10-03 13:35:57 UTC (rev 60529)
+++ trunk/blender/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py 2013-10-03 14:24:54 UTC (rev 60530)
@@ -1,18 +0,0 @@
-import bpy
-op = bpy.context.active_operator
-
-op.apply_modifiers = True
-op.export_mesh_type = 0
-op.export_mesh_type_selection = 'view'
-op.selected = True
-op.include_children = False
-op.include_armatures = True
-op.include_shapekeys = False
-op.deform_bones_only = True
-op.active_uv_only = True
-op.include_uv_textures = True
-op.use_texture_copies = True
-op.triangulate = True
-op.use_object_instantiation = False
-op.sort_by_name = True
-op.second_life = True
Deleted: trunk/blender/release/scripts/presets/operator/wm.collada_export/second_life_static.py
===================================================================
--- trunk/blender/release/scripts/presets/operator/wm.collada_export/second_life_static.py 2013-10-03 13:35:57 UTC (rev 60529)
+++ trunk/blender/release/scripts/presets/operator/wm.collada_export/second_life_static.py 2013-10-03 14:24:54 UTC (rev 60530)
@@ -1,18 +0,0 @@
-import bpy
-op = bpy.context.active_operator
-
-op.apply_modifiers = True
-op.export_mesh_type = 0
-op.export_mesh_type_selection = 'view'
-op.selected = True
-op.include_children = False
-op.include_armatures = False
-op.include_shapekeys = False
-op.deform_bones_only = False
-op.active_uv_only = True
-op.include_uv_textures = True
-op.use_texture_copies = True
-op.triangulate = True
-op.use_object_instantiation = False
-op.sort_by_name = True
-op.second_life = False
Modified: trunk/blender/source/blender/collada/AnimationExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.cpp 2013-10-03 13:35:57 UTC (rev 60529)
+++ trunk/blender/source/blender/collada/AnimationExporter.cpp 2013-10-03 14:24:54 UTC (rev 60530)
@@ -963,10 +963,10 @@
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;
Modified: trunk/blender/source/blender/collada/ArmatureExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureExporter.cpp 2013-10-03 13:35:57 UTC (rev 60529)
+++ trunk/blender/source/blender/collada/ArmatureExporter.cpp 2013-10-03 14:24:54 UTC (rev 60530)
@@ -193,11 +193,11 @@
// 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 @@
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];
Modified: trunk/blender/source/blender/collada/ControllerExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ControllerExporter.cpp 2013-10-03 13:35:57 UTC (rev 60529)
+++ trunk/blender/source/blender/collada/ControllerExporter.cpp 2013-10-03 14:24:54 UTC (rev 60530)
@@ -507,8 +507,8 @@
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);
Modified: trunk/blender/source/blender/collada/ExportSettings.h
===================================================================
--- trunk/blender/source/blender/collada/ExportSettings.h 2013-10-03 13:35:57 UTC (rev 60529)
+++ trunk/blender/source/blender/collada/ExportSettings.h 2013-10-03 14:24:54 UTC (rev 60530)
@@ -50,7 +50,7 @@
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;
Modified: trunk/blender/source/blender/collada/collada.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada.cpp 2013-10-03 13:35:57 UTC (rev 60529)
+++ trunk/blender/source/blender/collada/collada.cpp 2013-10-03 14:24:54 UTC (rev 60530)
@@ -79,7 +79,7 @@
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 @@
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;
Modified: trunk/blender/source/blender/collada/collada.h
===================================================================
--- trunk/blender/source/blender/collada/collada.h 2013-10-03 13:35:57 UTC (rev 60529)
+++ trunk/blender/source/blender/collada/collada.h 2013-10-03 14:24:54 UTC (rev 60530)
@@ -77,7 +77,7 @@
int use_object_instantiation,
int sort_by_name,
BC_export_transformation_type export_transformation_type,
- int second_life);
+ int open_sim);
Modified: trunk/blender/source/blender/editors/io/io_collada.c
===================================================================
--- trunk/blender/source/blender/editors/io/io_collada.c 2013-10-03 13:35:57 UTC (rev 60529)
+++ trunk/blender/source/blender/editors/io/io_collada.c 2013-10-03 14:24:54 UTC (rev 60530)
@@ -96,7 +96,7 @@
int use_object_instantiation;
int sort_by_name;
int export_transformation_type;
- int second_life;
+ int open_sim;
if (!RNA_struct_property_is_set(op->ptr, "filepath")) {
BKE_report(op->reports, RPT_ERROR, "No filename given");
@@ -142,7 +142,7 @@
use_object_instantiation = RNA_boolean_get(op->ptr, "use_object_instantiation");
sort_by_name = RNA_boolean_get(op->ptr, "sort_by_name");
export_transformation_type = RNA_enum_get(op->ptr, "export_transformation_type_selection");
- second_life = RNA_boolean_get(op->ptr, "second_life");
+ open_sim = RNA_boolean_get(op->ptr, "open_sim");
/* get editmode results */
ED_object_editmode_load(CTX_data_edit_object(C));
@@ -168,7 +168,7 @@
use_object_instantiation,
sort_by_name,
export_transformation_type,
- second_life))
+ open_sim))
{
return OPERATOR_FINISHED;
}
@@ -236,7 +236,7 @@
row = uiLayoutRow(box, FALSE);
uiItemR(row, imfptr, "deform_bones_only", 0, NULL, ICON_NONE);
row = uiLayoutRow(box, FALSE);
- uiItemR(row, imfptr, "second_life", 0, NULL, ICON_NONE);
+ uiItemR(row, imfptr, "open_sim", 0, NULL, ICON_NONE);
/* Collada options: */
box = uiLayoutBox(layout);
@@ -350,8 +350,8 @@
RNA_def_enum(ot->srna, "export_transformation_type_selection", prop_bc_export_transformation_type, 0,
"Transform", "Transformation type for translation, scale and rotation");
- RNA_def_boolean(ot->srna, "second_life", 0, "Export for Second Life",
- "Compatibility mode for Second Life");
+ RNA_def_boolean(ot->srna, "open_sim", 0, "Export for OpenSim",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list