config/patches/qt.004_blender_scene.patch

   1 diff -NaurwB /tmp/qt/qt-5.6.1__0/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp /tmp/qt/qt-5.6.1__1/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp
   2 --- qt-5.6.1__0/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp  2017-03-15 17:56:09.572756601 +0300
   3 +++ qt-5.6.1__1/qt3d/src/3rdparty/assimp/code/BlenderScene.cpp  2017-03-15 18:00:35.950259586 +0300
   4 @@ -677,39 +677,39 @@
   5  //--------------------------------------------------------------------------------
   6  void DNA::RegisterConverters() {
   7
   8 -    converters["Object"] = DNA::FactoryPair( &Structure::Allocate<Object>, &Structure::Convert<Object> );
   9 -    converters["Group"] = DNA::FactoryPair( &Structure::Allocate<Group>, &Structure::Convert<Group> );
  10 -    converters["MTex"] = DNA::FactoryPair( &Structure::Allocate<MTex>, &Structure::Convert<MTex> );
  11 -    converters["TFace"] = DNA::FactoryPair( &Structure::Allocate<TFace>, &Structure::Convert<TFace> );
  12 -    converters["SubsurfModifierData"] = DNA::FactoryPair( &Structure::Allocate<SubsurfModifierData>, &Structure::Convert<SubsurfModifierData> );
  13 -    converters["MFace"] = DNA::FactoryPair( &Structure::Allocate<MFace>, &Structure::Convert<MFace> );
  14 -    converters["Lamp"] = DNA::FactoryPair( &Structure::Allocate<Lamp>, &Structure::Convert<Lamp> );
  15 -    converters["MDeformWeight"] = DNA::FactoryPair( &Structure::Allocate<MDeformWeight>, &Structure::Convert<MDeformWeight> );
  16 -    converters["PackedFile"] = DNA::FactoryPair( &Structure::Allocate<PackedFile>, &Structure::Convert<PackedFile> );
  17 -    converters["Base"] = DNA::FactoryPair( &Structure::Allocate<Base>, &Structure::Convert<Base> );
  18 -    converters["MTFace"] = DNA::FactoryPair( &Structure::Allocate<MTFace>, &Structure::Convert<MTFace> );
  19 -    converters["Material"] = DNA::FactoryPair( &Structure::Allocate<Material>, &Structure::Convert<Material> );
  20 -    converters["MTexPoly"] = DNA::FactoryPair( &Structure::Allocate<MTexPoly>, &Structure::Convert<MTexPoly> );
  21 -    converters["Mesh"] = DNA::FactoryPair( &Structure::Allocate<Mesh>, &Structure::Convert<Mesh> );
  22 -    converters["MDeformVert"] = DNA::FactoryPair( &Structure::Allocate<MDeformVert>, &Structure::Convert<MDeformVert> );
  23 -    converters["World"] = DNA::FactoryPair( &Structure::Allocate<World>, &Structure::Convert<World> );
  24 -    converters["MLoopCol"] = DNA::FactoryPair( &Structure::Allocate<MLoopCol>, &Structure::Convert<MLoopCol> );
  25 -    converters["MVert"] = DNA::FactoryPair( &Structure::Allocate<MVert>, &Structure::Convert<MVert> );
  26 -    converters["MEdge"] = DNA::FactoryPair( &Structure::Allocate<MEdge>, &Structure::Convert<MEdge> );
  27 -    converters["MLoopUV"] = DNA::FactoryPair( &Structure::Allocate<MLoopUV>, &Structure::Convert<MLoopUV> );
  28 -    converters["GroupObject"] = DNA::FactoryPair( &Structure::Allocate<GroupObject>, &Structure::Convert<GroupObject> );
  29 -    converters["ListBase"] = DNA::FactoryPair( &Structure::Allocate<ListBase>, &Structure::Convert<ListBase> );
  30 -    converters["MLoop"] = DNA::FactoryPair( &Structure::Allocate<MLoop>, &Structure::Convert<MLoop> );
  31 -    converters["ModifierData"] = DNA::FactoryPair( &Structure::Allocate<ModifierData>, &Structure::Convert<ModifierData> );
  32 -    converters["ID"] = DNA::FactoryPair( &Structure::Allocate<ID>, &Structure::Convert<ID> );
  33 -    converters["MCol"] = DNA::FactoryPair( &Structure::Allocate<MCol>, &Structure::Convert<MCol> );
  34 -    converters["MPoly"] = DNA::FactoryPair( &Structure::Allocate<MPoly>, &Structure::Convert<MPoly> );
  35 -    converters["Scene"] = DNA::FactoryPair( &Structure::Allocate<Scene>, &Structure::Convert<Scene> );
  36 -    converters["Library"] = DNA::FactoryPair( &Structure::Allocate<Library>, &Structure::Convert<Library> );
  37 -    converters["Tex"] = DNA::FactoryPair( &Structure::Allocate<Tex>, &Structure::Convert<Tex> );
  38 -    converters["Camera"] = DNA::FactoryPair( &Structure::Allocate<Camera>, &Structure::Convert<Camera> );
  39 -    converters["MirrorModifierData"] = DNA::FactoryPair( &Structure::Allocate<MirrorModifierData>, &Structure::Convert<MirrorModifierData> );
  40 -    converters["Image"] = DNA::FactoryPair( &Structure::Allocate<Image>, &Structure::Convert<Image> );
  41 +    converters["Object"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<Object>, (DNA::ConvertProcPtr)&Structure::Convert<Object> );
  42 +    converters["Group"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<Group>, (DNA::ConvertProcPtr)&Structure::Convert<Group> );
  43 +    converters["MTex"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MTex>, (DNA::ConvertProcPtr)&Structure::Convert<MTex> );
  44 +    converters["TFace"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<TFace>, (DNA::ConvertProcPtr)&Structure::Convert<TFace> );
  45 +    converters["SubsurfModifierData"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<SubsurfModifierData>, (DNA::ConvertProcPtr)&Structure::Convert<SubsurfModifierData> );
  46 +    converters["MFace"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MFace>, (DNA::ConvertProcPtr)&Structure::Convert<MFace> );
  47 +    converters["Lamp"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<Lamp>, (DNA::ConvertProcPtr)&Structure::Convert<Lamp> );
  48 +    converters["MDeformWeight"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MDeformWeight>, (DNA::ConvertProcPtr)&Structure::Convert<MDeformWeight> );
  49 +    converters["PackedFile"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<PackedFile>, (DNA::ConvertProcPtr)&Structure::Convert<PackedFile> );
  50 +    converters["Base"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<Base>, (DNA::ConvertProcPtr)&Structure::Convert<Base> );
  51 +    converters["MTFace"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MTFace>, (DNA::ConvertProcPtr)&Structure::Convert<MTFace> );
  52 +    converters["Material"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<Material>, (DNA::ConvertProcPtr)&Structure::Convert<Material> );
  53 +    converters["MTexPoly"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MTexPoly>, (DNA::ConvertProcPtr)&Structure::Convert<MTexPoly> );
  54 +    converters["Mesh"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<Mesh>, (DNA::ConvertProcPtr)&Structure::Convert<Mesh> );
  55 +    converters["MDeformVert"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MDeformVert>, (DNA::ConvertProcPtr)&Structure::Convert<MDeformVert> );
  56 +    converters["World"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<World>, (DNA::ConvertProcPtr)&Structure::Convert<World> );
  57 +    converters["MLoopCol"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MLoopCol>, (DNA::ConvertProcPtr)&Structure::Convert<MLoopCol> );
  58 +    converters["MVert"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MVert>, (DNA::ConvertProcPtr)&Structure::Convert<MVert> );
  59 +    converters["MEdge"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MEdge>, (DNA::ConvertProcPtr)&Structure::Convert<MEdge> );
  60 +    converters["MLoopUV"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MLoopUV>, (DNA::ConvertProcPtr)&Structure::Convert<MLoopUV> );
  61 +    converters["GroupObject"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<GroupObject>, (DNA::ConvertProcPtr)&Structure::Convert<GroupObject> );
  62 +    converters["ListBase"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<ListBase>, (DNA::ConvertProcPtr)&Structure::Convert<ListBase> );
  63 +    converters["MLoop"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MLoop>, (DNA::ConvertProcPtr)&Structure::Convert<MLoop> );
  64 +    converters["ModifierData"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<ModifierData>, (DNA::ConvertProcPtr)&Structure::Convert<ModifierData> );
  65 +    converters["ID"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<ID>, (DNA::ConvertProcPtr)&Structure::Convert<ID> );
  66 +    converters["MCol"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MCol>, (DNA::ConvertProcPtr)&Structure::Convert<MCol> );
  67 +    converters["MPoly"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MPoly>, (DNA::ConvertProcPtr)&Structure::Convert<MPoly> );
  68 +    converters["Scene"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<Scene>, (DNA::ConvertProcPtr)&Structure::Convert<Scene> );
  69 +    converters["Library"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<Library>, (DNA::ConvertProcPtr)&Structure::Convert<Library> );
  70 +    converters["Tex"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<Tex>, (DNA::ConvertProcPtr)&Structure::Convert<Tex> );
  71 +    converters["Camera"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<Camera>, (DNA::ConvertProcPtr)&Structure::Convert<Camera> );
  72 +    converters["MirrorModifierData"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<MirrorModifierData>, (DNA::ConvertProcPtr)&Structure::Convert<MirrorModifierData> );
  73 +    converters["Image"] = DNA::FactoryPair( (DNA::AllocProcPtr)&Structure::Allocate<Image>, (DNA::ConvertProcPtr)&Structure::Convert<Image> );
  74  }
  75
  76