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
OpenFlipper-Free
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
23
Issues
23
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
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
OpenFlipper-Free
OpenFlipper-Free
Commits
49d20c8c
Commit
49d20c8c
authored
Jun 21, 2019
by
Max Lyon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into CMakeSimplification
# Conflicts: # OpenFlipper
parents
d09751f3
f6df1e0c
Pipeline
#11007
passed with stages
in 36 minutes and 46 seconds
Changes
12
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
14 additions
and
10 deletions
+14
-10
.gitmodules
.gitmodules
+3
-0
CI/ci-cppcheck.sh
CI/ci-cppcheck.sh
+1
-1
OpenFlipper
OpenFlipper
+1
-1
Plugin-PropertyVis
Plugin-PropertyVis
+1
-1
Plugin-Remesher
Plugin-Remesher
+1
-1
Plugin-VSI
Plugin-VSI
+1
-1
Plugin-ViewControl
Plugin-ViewControl
+1
-1
Plugin-VolumeMeshConvert
Plugin-VolumeMeshConvert
+1
-0
PluginCollection-FilePlugins
PluginCollection-FilePlugins
+1
-1
Type-OpenVolumeMesh
Type-OpenVolumeMesh
+1
-1
Type-Skeleton
Type-Skeleton
+1
-1
Type-SplatCloud
Type-SplatCloud
+1
-1
No files found.
.gitmodules
View file @
49d20c8c
...
@@ -237,3 +237,6 @@
...
@@ -237,3 +237,6 @@
[submodule "Plugin-Noise"]
[submodule "Plugin-Noise"]
path = Plugin-Noise
path = Plugin-Noise
url = https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/Plugin-Noise.git
url = https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/Plugin-Noise.git
[submodule "Plugin-VolumeMeshConvert"]
path = Plugin-VolumeMeshConvert
url = https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/Plugin-VolumeMeshConvert.git
CI/ci-cppcheck.sh
View file @
49d20c8c
...
@@ -60,7 +60,7 @@ echo "CPPCHECK Summary"
...
@@ -60,7 +60,7 @@ echo "CPPCHECK Summary"
echo
"=============================================================================="
echo
"=============================================================================="
echo
-e
"
${
NC
}
"
echo
-e
"
${
NC
}
"
MAX_ERROR
=
8
0
MAX_ERROR
=
26
0
if
[
$COUNT
-gt
$MAX_ERROR
]
;
then
if
[
$COUNT
-gt
$MAX_ERROR
]
;
then
echo
-e
${
WARNING
}
echo
-e
${
WARNING
}
...
...
OpenFlipper
@
5edb5a05
Compare
1210a46c
...
5edb5a05
Subproject commit
1210a46cd883495a11e0f8eda8fe7becb6b6b058
Subproject commit
5edb5a0557b45a37594afb1ee453806d11aea306
Plugin-PropertyVis
@
242b124a
Compare
d08962e7
...
242b124a
Subproject commit
d08962e7778878f5aeae6f469b77116ad059dc53
Subproject commit
242b124a7baa7cf2feaa339f5e621976e60e5754
Plugin-Remesher
@
253b9155
Compare
ba4cbcbf
...
253b9155
Subproject commit
ba4cbcbf12f5589f1d6e22bbd884ff7db75146db
Subproject commit
253b915502a2bb0f62d79c9fdd358e07d8cae66d
Plugin-VSI
@
cf2c39a1
Compare
f676da75
...
cf2c39a1
Subproject commit
f676da755eba6720b70273e50f9eacc92d84a9e6
Subproject commit
cf2c39a123e3660dd29bc27ba1808c69a2f91a2b
Plugin-ViewControl
@
07d9a2e3
Compare
283a1702
...
07d9a2e3
Subproject commit
283a17021aa3b45a7897a8cca59ce034d5249239
Subproject commit
07d9a2e30d2d665f29dfb61160629649b4428644
Plugin-VolumeMeshConvert
@
bed1088c
Subproject commit bed1088c192c94f496602de99d75e5c780a51832
PluginCollection-FilePlugins
@
1fa76ad8
Compare
895af93e
...
1fa76ad8
Subproject commit
895af93efefb9a7e841bd26007612b4d5ae0d10
f
Subproject commit
1fa76ad8b68c3f6e732eee058f28047e76b84ae
f
Type-OpenVolumeMesh
@
b85c29d5
Compare
58cb63d0
...
b85c29d5
Subproject commit
58cb63d0e6398b639ffe73c0cd16ed0c8bb88bc0
Subproject commit
b85c29d54fa7d836eeab2e988746b56ee73a11bb
Type-Skeleton
@
1218e1ff
Compare
7cca2abf
...
1218e1ff
Subproject commit
7cca2abf3b78a88d159a7d5114b37f5be4bf78a
2
Subproject commit
1218e1ffb6c75ecd6993ec850ddc7dec4bc9c62
2
Type-SplatCloud
@
8d4bc8ad
Compare
14846061
...
8d4bc8ad
Subproject commit
14846061edbd0352b80f1c23185eb9395c0fed1a
Subproject commit
8d4bc8ad6f892a364f9a7252fa7847fd414a3a54
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