-
Notifications
You must be signed in to change notification settings - Fork 725
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is a bugfix release. Included is a patch for compatibility with opencascade 7.6
- Loading branch information
1 parent
a1e5595
commit 069928b
Showing
13 changed files
with
69 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1619553893 | ||
| SHA256 (kicad-doc-5.1.10.tar.gz) = 73d986b7a9d5d777e4bf9bc7594e43568e067cd33466940957b5a513d9affd03 | ||
| SIZE (kicad-doc-5.1.10.tar.gz) = 316075538 | ||
| TIMESTAMP = 1636463164 | ||
| SHA256 (kicad-doc-5.1.12.tar.gz) = 8bf34f46758cf631f81f18490310ae7673e343da5eedc5c53192375ee1744479 | ||
| SIZE (kicad-doc-5.1.12.tar.gz) = 316618503 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1619292915 | ||
| SHA256 (kicad-footprints-5.1.10.tar.bz2) = 6707d1c79f57a305773ed8c16971d223ae704fde3e6c238958711be41bec8975 | ||
| SIZE (kicad-footprints-5.1.10.tar.bz2) = 3382220 | ||
| TIMESTAMP = 1636062324 | ||
| SHA256 (kicad-footprints-5.1.12.tar.bz2) = 2f32db7986bfd7c9d42420542d83733c27a604270697e90c9affa15a0cc4707a | ||
| SIZE (kicad-footprints-5.1.12.tar.bz2) = 3382783 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1619293768 | ||
| SHA256 (kicad-packages3D-5.1.10.tar.bz2) = 5b02128fcb5ff69f9c9468b6876d7df68ace0eefb55359f6f37e36ebadd32a0b | ||
| SIZE (kicad-packages3D-5.1.10.tar.bz2) = 727194444 | ||
| TIMESTAMP = 1636063087 | ||
| SHA256 (kicad-packages3D-5.1.12.tar.bz2) = cf776c1cc76f9c0f2901111bf34350fcc5ddab20e658f07d150b81306107662e | ||
| SIZE (kicad-packages3D-5.1.12.tar.bz2) = 727191578 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1619292928 | ||
| SHA256 (kicad-symbols-5.1.10.tar.bz2) = cbf71394a8f130c3480471e17e90816311ae3c9ca3f916800511e2f16a7b5285 | ||
| SIZE (kicad-symbols-5.1.10.tar.bz2) = 1815573 | ||
| TIMESTAMP = 1636062348 | ||
| SHA256 (kicad-symbols-5.1.12.tar.bz2) = ab2b42de0ca82c193df141e4883a19b1a16e5335f15964f9006b101eaa4c8f91 | ||
| SIZE (kicad-symbols-5.1.12.tar.bz2) = 1815145 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1619292952 | ||
| SHA256 (kicad-templates-5.1.10.tar.bz2) = c02f516f15fac89c778cc3e90ca2c53bfb293eb98566c90b23f4bf1be942a2e2 | ||
| SIZE (kicad-templates-5.1.10.tar.bz2) = 1552124 | ||
| TIMESTAMP = 1636062369 | ||
| SHA256 (kicad-templates-5.1.12.tar.bz2) = 4afcf871b7f0c6d55d07deb8f13106861495a6166fd49edd8b18b5d952974e16 | ||
| SIZE (kicad-templates-5.1.12.tar.bz2) = 1552173 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1619292871 | ||
| SHA256 (kicad-5.1.10.tar.bz2) = c1bd8521a581964e35b70d23d3b41380eae08e8ab8838db9a5f11b1f818378f9 | ||
| SIZE (kicad-5.1.10.tar.bz2) = 18586889 | ||
| TIMESTAMP = 1636062293 | ||
| SHA256 (kicad-5.1.12.tar.bz2) = af2a485911566097ca61efa394da6779d3bdf9b7dcbe27f56f4d9fc8b105d78b | ||
| SIZE (kicad-5.1.12.tar.bz2) = 18581842 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| --- plugins/3d/oce/loadmodel.cpp.orig 2021-11-08 21:10:20.307953000 +0100 | ||
| +++ plugins/3d/oce/loadmodel.cpp 2021-11-08 21:42:19.793113000 +0100 | ||
| @@ -71,6 +71,8 @@ | ||
| #include <TDF_LabelSequence.hxx> | ||
| #include <TDF_ChildIterator.hxx> | ||
|
|
||
| +#include <Standard_Version.hxx> | ||
| + | ||
| #include "plugins/3dapi/ifsg_all.h" | ||
|
|
||
| // log mask for wxLogTrace | ||
| @@ -865,8 +867,10 @@ | ||
| else | ||
| S3D::AddSGNodeRef( vshape.GetRawPtr(), ocolor ); | ||
|
|
||
| +#if OCC_VERSION_HEX < 0x070600 | ||
| const TColgp_Array1OfPnt& arrPolyNodes = triangulation->Nodes(); | ||
| const Poly_Array1OfTriangle& arrTriangles = triangulation->Triangles(); | ||
| +#endif | ||
|
|
||
| std::vector< SGPOINT > vertices; | ||
| std::vector< int > indices; | ||
| @@ -875,14 +879,22 @@ | ||
|
|
||
| for(int i = 1; i <= triangulation->NbNodes(); i++) | ||
| { | ||
| +#if OCC_VERSION_HEX < 0x070600 | ||
| gp_XYZ v( arrPolyNodes(i).Coord() ); | ||
| +#else | ||
| + gp_XYZ v( triangulation->Node(i).Coord() ); | ||
| +#endif | ||
| vertices.push_back( SGPOINT( v.X(), v.Y(), v.Z() ) ); | ||
| } | ||
|
|
||
| for(int i = 1; i <= triangulation->NbTriangles(); i++) | ||
| { | ||
| int a, b, c; | ||
| +#if OCC_VERSION_HEX < 0x070600 | ||
| arrTriangles( i ).Get( a, b, c ); | ||
| +#else | ||
| + triangulation->Triangle(i).Get(a, b, c); | ||
| +#endif | ||
| a--; | ||
|
|
||
| if( reverse ) |