diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
commit | 66738d4aa017203caff067c41e25e28d62c3fd0b (patch) | |
tree | dee20ce0b0b6293812eeb76be279d9103297d60b /source/blender/collada/ArmatureExporter.cpp | |
parent | 95f2604ea7b32d034cce7c7ec46149eaf6174d47 (diff) | |
parent | 2083a7e274fefd4c82c8c52df87bc175e453c628 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/ArmatureExporter.cpp')
-rw-r--r-- | source/blender/collada/ArmatureExporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/collada/ArmatureExporter.cpp index 85b9d3297ca..a77385c8d00 100644 --- a/source/blender/collada/ArmatureExporter.cpp +++ b/source/blender/collada/ArmatureExporter.cpp @@ -69,7 +69,7 @@ void ArmatureExporter::add_armature_bones(bContext *C, Depsgraph *depsgraph, Obj Main *bmain = CTX_data_main(C); // write bone nodes - bArmature * armature = (bArmature *)ob_arm->data; + bArmature *armature = (bArmature *)ob_arm->data; bool is_edited = armature->edbo != NULL; if (!is_edited) |