← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/collada/collada_internal.cpp

  • Committer: Package Import Robot
  • Author(s): Kevin Roy
  • Date: 2011-10-21 14:21:47 UTC
  • mfrom: (14.2.10 sid)
  • Revision ID: package-import@ubuntu.com-20111021142147-2yjgibwwnmqibacp
Tags: 2.59-1
http://bugs.debian.org/641085
http://bugs.debian.org/636177
* New Upstream Release 2.59 (Closes: #641085)
* debian/control: libglew dependency changed
  - changed Depends libglew1.5-dev to libglew1.6-dev
   due to transition. (Closes: #636177)
* update manpages
* change depends yafray to new yafaray packages 
      (Thanks to Matteo F. Vescovi)

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/collada/collada_internal.cpp
1
1
/*
2
 
 * $Id: collada_internal.cpp 37664 2011-06-20 12:43:10Z jesterking $
 
2
 * $Id: collada_internal.cpp 38079 2011-07-04 08:59:28Z jesterking $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
265
265
 
266
266
std::string get_joint_id(Bone *bone, Object *ob_arm)
267
267
{
268
 
        return translate_id(bone->name);
 
268
        return translate_id(/*id_name(ob_arm) + "_" +*/ bone->name);
269
269
}
270
270
 
271
271
std::string get_camera_id(Object *ob)