Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
ddbe5f0e
Commit
ddbe5f0e
authored
Oct 26, 2016
by
Ole Untzelmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed PolyLine collection color update
parent
1a23ec78
Pipeline
#3364
passed with stage
in 44 minutes and 46 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletion
+6
-1
ObjectTypes/PolyLine/PolyLineT.cc
ObjectTypes/PolyLine/PolyLineT.cc
+1
-1
ObjectTypes/PolyLineCollection/PolyLineCollectionNodeT.hh
ObjectTypes/PolyLineCollection/PolyLineCollectionNodeT.hh
+1
-0
ObjectTypes/PolyLineCollection/PolyLineCollectionObject.cc
ObjectTypes/PolyLineCollection/PolyLineCollectionObject.cc
+4
-0
No files found.
ObjectTypes/PolyLine/PolyLineT.cc
View file @
ddbe5f0e
...
...
@@ -2276,7 +2276,7 @@ void PolyLineT<PointT>::
unsigned
int
offset
=
p
->
prop_size
*
_i
;
// check out of range
if
(
offset
+
p
->
prop_size
>
=
p
->
prop_data
.
size
())
{
if
(
offset
+
p
->
prop_size
>
p
->
prop_data
.
size
())
{
std
::
cerr
<<
"PolyLineT::get_custom_property - out of range access"
<<
std
::
endl
;
return
;
}
...
...
ObjectTypes/PolyLineCollection/PolyLineCollectionNodeT.hh
View file @
ddbe5f0e
...
...
@@ -118,6 +118,7 @@ public:
/// Trigger an update of the vbo
void
update
()
{
updateVBO_
=
true
;
};
void
resetVBO
()
{
offsets_
.
clear
();}
private:
...
...
ObjectTypes/PolyLineCollection/PolyLineCollectionObject.cc
View file @
ddbe5f0e
...
...
@@ -203,6 +203,10 @@ PolyLineCollection* PolyLineCollectionObject::collection() {
void
PolyLineCollectionObject
::
update
(
UpdateType
_type
)
{
if
(
_type
==
UPDATE_COLOR
||
_type
==
UPDATE_ALL
){
collectionNode_
->
resetVBO
();
}
collectionNode_
->
update
();
}
...
...
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