Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenVolumeMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenVolumeMesh
OpenVolumeMesh
Commits
d37341fb
Commit
d37341fb
authored
May 28, 2019
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into adjust-compiler-warnings
parents
84d654a3
bdd674be
Pipeline
#10597
passed with stage
in 4 minutes and 25 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
12 deletions
+4
-12
src/OpenVolumeMesh/Attribs/NormalAttribT_impl.hh
src/OpenVolumeMesh/Attribs/NormalAttribT_impl.hh
+2
-10
src/OpenVolumeMesh/Core/ResourceManager.cc
src/OpenVolumeMesh/Core/ResourceManager.cc
+2
-2
No files found.
src/OpenVolumeMesh/Attribs/NormalAttribT_impl.hh
View file @
d37341fb
...
...
@@ -32,14 +32,6 @@
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* $LastChangedBy$ *
* *
\*===========================================================================*/
#define NORMALATTRIBT_CC
#include <set>
...
...
@@ -53,8 +45,8 @@ namespace OpenVolumeMesh {
template
<
class
GeomKernelT
>
NormalAttrib
<
GeomKernelT
>::
NormalAttrib
(
GeomKernelT
&
_kernel
)
:
kernel_
(
_kernel
),
v_normals_
(
_kernel
.
template
request_vertex_property
<
typename
GeomKernelT
::
PointT
>(
"vertex_normals"
)),
f_normals_
(
_kernel
.
template
request_face_property
<
typename
GeomKernelT
::
PointT
>(
"face_normals"
))
v_normals_
(
_kernel
.
template
request_vertex_property
<
typename
GeomKernelT
::
PointT
>(
"vertex_normals"
,
typename
GeomKernelT
::
PointT
(
0.0
)
)),
f_normals_
(
_kernel
.
template
request_face_property
<
typename
GeomKernelT
::
PointT
>(
"face_normals"
,
typename
GeomKernelT
::
PointT
(
0.0
)
))
{
}
...
...
src/OpenVolumeMesh/Core/ResourceManager.cc
View file @
d37341fb
...
...
@@ -261,9 +261,9 @@ void ResourceManager::assignProperties(typename std::conditional<Move, Propertie
bool
found
=
false
;
for
(
auto
it
=
dest
.
begin
();
it
!=
dest
.
end
();
++
it
)
{
auto
dstprop
=
*
it
;
if
(
dstprop
->
name
()
==
srcprop
->
name
())
if
(
dstprop
->
name
()
==
srcprop
->
name
()
&&
dstprop
->
internal_type_name
()
==
srcprop
->
internal_type_name
())
{
// TODO: type check
out
.
push_back
(
dstprop
);
dest
.
erase
(
it
);
if
(
Move
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment