Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/multi_texcoord_set' into multi_t…
Browse files Browse the repository at this point in the history
…excoord_set
  • Loading branch information
iche033 committed Dec 18, 2020
2 parents bcdac31 + 471ff73 commit 1243429
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-common3 VERSION 3.7.0)
project(ignition-common3 VERSION 3.8.0)

#============================================================================
# Find ignition-cmake
Expand Down
24 changes: 24 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,30 @@

## Ignition Common 3.X.X

## Ignition Common 3.8.0 (2020-12-08)

1. Call ignition::common::load() from Video constructor
* [Pull Request 111](https://github.com/ignitionrobotics/ign-common/pull/111)

1. Cleanup
* Drop unused forward declaration: [Pull Request 113](https://github.com/ignitionrobotics/ign-common/pull/113)
* Remove two known flaky tests from Windows CI: [Pull Request 119](https://github.com/ignitionrobotics/ign-common/pull/119)
* Make ignstrtok private to Util.cc: [Pull Request 134](https://github.com/ignitionrobotics/ign-common/pull/134)
* Fix memory leaks [Pull Request 136](https://github.com/ignitionrobotics/ign-common/pull/136)

1. Windows
* Do not hardcode USE_EXTERNAL_TINYXML2 to OFF: [Pull Request 116](https://github.com/ignitionrobotics/ign-common/pull/116)
* Fix IGN_HOMEDIR on Windows: [Pull Request 127](https://github.com/ignitionrobotics/ign-common/pull/127)
* Improve Windows support: [Pull Request 128](https://github.com/ignitionrobotics/ign-common/pull/128)
* Fix Windows AV CI warnings and test failures: [Pull Request 135](https://github.com/ignitionrobotics/ign-common/pull/135)

1. Fix video encoder timing
* [Pull Request 105](https://github.com/ignitionrobotics/ign-common/pull/105)

1. Feature: Add transformation matrix to ColladaExport
* [Pull Request 100](https://github.com/ignitionrobotics/ign-common/pull/100)
* Fix: [Pull Request 133](https://github.com/ignitionrobotics/ign-common/pull/133)

## Ignition Common 3.7.0 (2020-10-21)

1. Miscellaneous Cleanups
Expand Down
1 change: 1 addition & 0 deletions graphics/src/GTSMeshUtils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ GtsSurface *GTSMeshUtils::DelaunayTriangulation(
edgeList);

gts_fifo_destroy(edgeList);
g_slist_free(verticesList);
return surface;
}

Expand Down
3 changes: 2 additions & 1 deletion graphics/src/GTSMeshUtils_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/

#include <gtest/gtest.h>
#include <memory>

#include "test_config.h"
#include "ignition/common/GTSMeshUtils.hh"
Expand Down Expand Up @@ -62,7 +63,7 @@ TEST_F(GTSMeshUtils, DelaunayTriangulation)
edges.push_back(ignition::math::Vector2i(6, 7));
edges.push_back(ignition::math::Vector2i(7, 4));

common::Mesh *mesh = new common::Mesh();
auto mesh = std::make_unique<common::Mesh>();
mesh->SetName("extruded");
common::SubMesh subMesh;

Expand Down

0 comments on commit 1243429

Please sign in to comment.