From e3602ae7c0dfe8207066d9cdfcd1c07aca0396f3 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 5 Mar 2019 12:03:56 +0100 Subject: [PATCH 1/4] Add BACKERS.md, update README.md with info about OpenCollective [skip ci] --- BACKERS.md | 28 ++++++++++++++++++++++++++++ README.md | 24 ++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 BACKERS.md diff --git a/BACKERS.md b/BACKERS.md new file mode 100644 index 0000000000..b86afc0e71 --- /dev/null +++ b/BACKERS.md @@ -0,0 +1,28 @@ +# Panda3D Backers + +This is a list of all the people who are contributing financially to Panda3D. If you'd like to join them, visit [our campaign on OpenCollective](https://opencollective.com/panda3d)! + +## Gold Sponsors + +![Gold Sponsors](https://opencollective.com/panda3d/tiers/gold-sponsor.svg?avatarHeight=48&width=600) + +* [tcdude](https://opencollective.com/tizilogic) + +## Bronze Sponsors + +![Bronze Sponsors](https://opencollective.com/panda3d/tiers/bronze-sponsor.svg?avatarHeight=48&width=600) + +* [Mitchell Stokes](https://opencollective.com/mitchell-stokes) +* [Daniel Stokes](https://opencollective.com/daniel-stokes) +* [David Rose](https://opencollective.com/david-rose) +* [Carnetsoft](https://cs-driving-simulator.com/) + +## Benefactors + +![Benefactors](https://opencollective.com/panda3d/tiers/benefactor.svg?avatarHeight=48&width=600) + +* Sam Edwards + +## Backers + +![Backers](https://opencollective.com/panda3d/tiers/backer.svg?avatarHeight=48&width=600) diff --git a/README.md b/README.md index 4d26a0a778..73205e7cc4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ [![Build Status](https://travis-ci.org/panda3d/panda3d.svg?branch=master)](https://travis-ci.org/panda3d/panda3d) +[![OpenCollective](https://opencollective.com/panda3d/backers/badge.svg)](https://opencollective.com/panda3d) +[![OpenCollective](https://opencollective.com/panda3d/sponsors/badge.svg)](https://opencollective.com/panda3d) @@ -229,3 +231,25 @@ models that are necessary for the developers to reproduce the issue. If you're not sure whether you've encountered a bug, feel free to ask about it in the forums or the IRC channel first. + +Supporting the Project +====================== + +If you would like to support the project financially, visit +[our campaign on OpenCollective](https://opencollective.com/panda3d). Your +contributions help us accelerate the development of Panda3D. + +For the list of backers, see the [BACKERS.md](BACKERS.md) file or visit the +[Sponsors page](https://www.panda3d.org/sponsors) on our web site. Thank you +to everyone who has donated! + + + + + +### Gold Sponsors +[![](https://opencollective.com/panda3d/tiers/gold-sponsor/0/avatar.svg?avatarHeight=128)](https://opencollective.com/panda3d/tiers/gold-sponsor/0/website) +[![](https://opencollective.com/panda3d/tiers/gold-sponsor/1/avatar.svg?avatarHeight=128)](https://opencollective.com/panda3d/tiers/gold-sponsor/1/website) +[![](https://opencollective.com/panda3d/tiers/gold-sponsor/2/avatar.svg?avatarHeight=128)](https://opencollective.com/panda3d/tiers/gold-sponsor/2/website) +[![](https://opencollective.com/panda3d/tiers/gold-sponsor/3/avatar.svg?avatarHeight=128)](https://opencollective.com/panda3d/tiers/gold-sponsor/3/website) +[![](https://opencollective.com/panda3d/tiers/gold-sponsor/4/avatar.svg?avatarHeight=128)](https://opencollective.com/panda3d/tiers/gold-sponsor/4/website) From 12eeff0dec48784ea551c37d8d9d833d24db4a31 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 7 Mar 2019 17:33:21 +0100 Subject: [PATCH 2/4] py_panda: fix memory leak accessing map/seq properties --- dtool/src/interrogatedb/py_wrappers.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/dtool/src/interrogatedb/py_wrappers.cxx b/dtool/src/interrogatedb/py_wrappers.cxx index e004246249..9f463c9f92 100644 --- a/dtool/src/interrogatedb/py_wrappers.cxx +++ b/dtool/src/interrogatedb/py_wrappers.cxx @@ -47,6 +47,7 @@ static void Dtool_WrapperBase_dealloc(PyObject *self) { Dtool_WrapperBase *wrap = (Dtool_WrapperBase *)self; nassertv(wrap); Py_XDECREF(wrap->_self); + Py_TYPE(self)->tp_free(self); } static PyObject *Dtool_WrapperBase_repr(PyObject *self) { From 5426ec68dd6560d7102c8160cc88f25638646c23 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 7 Mar 2019 17:33:57 +0100 Subject: [PATCH 3/4] makepanda: properly respect --x11-incdir setting --- makepanda/makepanda.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 05d639e7d1..aeaa09585d 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -4026,12 +4026,12 @@ if (not RUNTIME): # if (not RUNTIME): - OPTS=['DIR:panda/src/display', 'BUILDING:PANDA'] + OPTS=['DIR:panda/src/display', 'BUILDING:PANDA', 'X11'] TargetAdd('p3display_graphicsStateGuardian.obj', opts=OPTS, input='graphicsStateGuardian.cxx') TargetAdd('p3display_composite1.obj', opts=OPTS, input='p3display_composite1.cxx') TargetAdd('p3display_composite2.obj', opts=OPTS, input='p3display_composite2.cxx') - OPTS=['DIR:panda/src/display'] + OPTS=['DIR:panda/src/display', 'X11'] IGATEFILES=GetDirectoryContents('panda/src/display', ["*.h", "*_composite*.cxx"]) IGATEFILES.remove("renderBuffer.h") TargetAdd('libp3display.in', opts=OPTS, input=IGATEFILES) @@ -5243,7 +5243,7 @@ if (GetTarget() == 'android' and PkgSkip("EGL")==0 and PkgSkip("GLES")==0 and no # if (not RUNTIME and (GetTarget() in ('windows', 'darwin') or PkgSkip("X11")==0) and PkgSkip("TINYDISPLAY")==0): - OPTS=['DIR:panda/src/tinydisplay', 'BUILDING:TINYDISPLAY'] + OPTS=['DIR:panda/src/tinydisplay', 'BUILDING:TINYDISPLAY', 'X11'] TargetAdd('p3tinydisplay_composite1.obj', opts=OPTS, input='p3tinydisplay_composite1.cxx') TargetAdd('p3tinydisplay_composite2.obj', opts=OPTS, input='p3tinydisplay_composite2.cxx') TargetAdd('p3tinydisplay_ztriangle_1.obj', opts=OPTS, input='ztriangle_1.cxx') From 5b00ff1aa72545d7b047d7dd906c06d06dab1d47 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 7 Mar 2019 17:45:00 +0100 Subject: [PATCH 4/4] readme: update links to point to 1.10.2 thirdparty packages The 1.10.2 thirdparty packages include a newer version of Pmw (with an __init__.py that will choose the older version when using Python 2). Fixes #573 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 73205e7cc4..9c4de7903d 100644 --- a/README.md +++ b/README.md @@ -64,8 +64,8 @@ depending on whether you are on a 32-bit or 64-bit system, or you can [click here](https://github.com/rdb/panda3d-thirdparty) for instructions on building them from source. -https://www.panda3d.org/download/panda3d-1.10.1/panda3d-1.10.1-tools-win64.zip -https://www.panda3d.org/download/panda3d-1.10.1/panda3d-1.10.1-tools-win32.zip +https://www.panda3d.org/download/panda3d-1.10.2/panda3d-1.10.2-tools-win64.zip +https://www.panda3d.org/download/panda3d-1.10.2/panda3d-1.10.2-tools-win32.zip After acquiring these dependencies, you may simply build Panda3D from the command prompt using the following command. (Change `14.1` to `14` if you are @@ -135,7 +135,7 @@ macOS ----- On macOS, you will need to download a set of precompiled thirdparty packages in order to -compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.1/panda3d-1.10.1-tools-mac.tar.gz). +compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.2/panda3d-1.10.2-tools-mac.tar.gz). After placing the thirdparty directory inside the panda3d source directory, you may build Panda3D using a command like the following: