Laurens Voerman
8743c18c5a
rewrote las plugin to read in a single pass: more speed, compressed file (.laz) support and better precision.
2017-03-06 14:23:17 +01:00
Marc Helbling
e906465dcb
Fix commented variable assertions in inventor writer
2017-03-06 14:08:27 +01:00
Marc Helbling
18826a9ebc
Fix implicit ref_ptr conversions
2017-03-06 14:08:27 +01:00
Marc Helbling
4627821e79
Revert bad change in 3ds reader
2017-03-06 12:29:19 +01:00
Marc Helbling
a97cdebe11
Remove unused offset attribute in MergeArrayVisitor
2017-03-06 12:25:48 +01:00
Marc Helbling
c765b0b62d
Add missing type for attribute merge
2017-03-06 12:25:23 +01:00
Robert Osfield
bb754b6f0a
Moved all vertex array set up to start of Text/Text3D::drawImplementation().
2017-03-04 17:20:54 +00:00
Robert Osfield
b88be0fbda
Implemented better handling of VertexBufferObjects and ElementBufferObjects in osgText
2017-03-03 18:31:51 +00:00
Robert Osfield
59931d1591
Removed unneccessary mutable usage
2017-03-02 17:05:24 +00:00
Robert Osfield
1e36a12a17
Updated Attribute and PrimitiveFunctor implementations
2017-03-02 16:33:09 +00:00
Robert Osfield
a69216a79d
Refactored osgText::Tex3D to use a single vertex and normal arrays and a combined set of primitive sets. Deprecated Text3D::RenderMode as it's no longer used.
2017-03-02 16:11:10 +00:00
Robert Osfield
4721651dbe
Added NEW_APPROACH code path that merges the separate GlyphGeometry arrays and primitives into a single set of arrays and primitives
2017-03-02 11:12:55 +00:00
d-a-heitbrink
7b3fc0925c
Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph
2017-03-01 16:12:49 -06:00
Robert Osfield
f233005988
Merged the decoration vertices with the same vertex arrays used for text glyphs
2017-03-01 16:43:05 +00:00
Robert Osfield
f4966a96d4
Replaced hardwired glDrawArrays calls with use of osg::DrawElementsUshort.
2017-03-01 11:51:27 +00:00
scrawl
c1dd0eb348
Add CMake options to control which osgPlugins/ are built
2017-02-28 22:56:42 +01:00
Robert Osfield
256441906f
Removed unused member variable
2017-02-28 17:12:58 +00:00
Robert Osfield
1290f1584a
Removed old Text::GlyphQuads array code paths
2017-02-28 17:02:02 +00:00
Robert Osfield
138af70bd8
Merged the Text::GlyphQuads cooordinate arrays
2017-02-28 16:34:33 +00:00
Robert Osfield
e5685dfca5
Removed old code paths
2017-02-27 15:15:37 +00:00
Robert Osfield
80c96cd54f
Added option for combining the GlyphQuad::backdropcoords into the GlyphQuad::coords.
2017-02-27 11:53:42 +00:00
Robert Osfield
8adbf322a0
Scaled back the primitives sets set up so they match the requirements of the osgText::Text accordinging to the BackdropType
2017-02-24 18:25:16 +00:00
Robert Osfield
a84a6bd309
Moved glyph quad setup into dedicated method
2017-02-24 17:08:48 +00:00
Laurens Voerman
ef01913b9a
allow library names liblas.lib and liblas_c.lib;fix include dirs typo; link only liblas_c in plugin.
2017-02-24 16:21:20 +01:00
Laurens Voerman
f8ed554ddb
use normal cmake search if PKG_CHECK_MODULES fails; fix win32 debug linking with SET(TARGET_LIBRARIES_VARS GTA_LIBRARY)
2017-02-24 16:09:13 +01:00
Robert Osfield
cefecaec10
Removed unused lineNumber
2017-02-24 11:17:22 +00:00
Robert Osfield
aa621e1a4a
Grouped GlyphQuad setup
2017-02-24 11:08:15 +00:00
Robert Osfield
4c032723ba
Fixed indentation
2017-02-24 10:40:52 +00:00
Robert Osfield
93f28d4eee
Moved to use of single vector of DrawElementsUShort for backdrops and foreground text quads
2017-02-24 10:07:01 +00:00
scrawl
c9621ff17a
Add missing copy of callbacks when a Transform is replaced by Group
2017-02-24 07:41:19 +01:00
scrawl
7e2436aba9
Change the order of optimizations to allow for the possibility of merging Geometries that have just become siblings after the removal of redundant nodes
2017-02-24 01:09:09 +01:00
scrawl
ef431eec29
Fix unused parameter warning
2017-02-24 01:07:24 +01:00
scrawl
e0f7d3241a
Fix MergeGeometryVisitor to work with a Group instead of Geode
2017-02-24 01:05:57 +01:00
scrawl
a918306a99
Use asDrawable()/asNode() over dynamic_cast in the Optimizer
2017-02-24 01:00:49 +01:00
Robert Osfield
22b8a5cc0f
Added missing relaseGLObjects()/resizeGLObjects().
...
Reordered calls to make it easier to read and see patterns.
2017-02-23 18:36:35 +00:00
Robert Osfield
b5048d3b74
Cleaned up types
2017-02-23 18:14:36 +00:00
Robert Osfield
8ff17ddf52
Restructed and unified the position computation
2017-02-23 15:45:43 +00:00
Robert Osfield
7b3ecefcfc
Removed the old code paths
2017-02-22 14:14:03 +00:00
Robert Osfield
f816436771
Removed the unncessary array.
2017-02-22 12:41:45 +00:00
Robert Osfield
04d23659b3
Added the option for changing the type of the GlyphQuads::Coords
2017-02-22 12:07:43 +00:00
Robert Osfield
f8dc5c4988
Fixed FadeText when using NEW_APPROACH
2017-02-21 17:47:54 +00:00
Robert Osfield
cd991eaa97
Refactored the computation of the transforms for the osgText::Text
2017-02-21 17:07:53 +00:00
blobfish
d3a925e675
osgManipulator: Constraint: snap_point_to_grid wants Vec3d instead of Vec3
2017-02-16 10:37:03 -05:00
scrawl
94061aa9fb
Add CMake option to not build deprecated serializers
2017-02-07 20:23:14 +01:00
OpenSceneGraph git repository
71bf79cf6f
Merge pull request #197 from scrawl/geodefix
...
More fixes for Geode/Drawable handling in visitors
2017-02-03 18:03:13 +00:00
scrawl
6deefe0646
Remove seemingly redundant handling of Geode in GLObjectsVisitor
2017-02-03 18:10:37 +01:00
scrawl
fdf6d55b9d
Fix handling of in-scenegraph Drawables in osgShadow
2017-02-03 18:08:16 +01:00
scrawl
e38c3d0303
Fix handling of in-scenegraph Drawables in SmoothingVisitor, TriStripVisitor and GraphicsCostEstimator
2017-02-03 17:55:55 +01:00
scrawl
4e1a2d3246
Fix handling of in-scenegraph Drawables in ShaderGenVisitor
2017-02-03 17:51:03 +01:00
scrawl
e48aa118b6
Fix handling of in-scenegraph Drawables in MeshOptimizers
2017-02-03 17:48:18 +01:00
scrawl
9403a4c949
Fix unused parameter warning
2017-02-03 17:45:22 +01:00
scrawl
c901694290
Fix handling of in-scenegraph Drawables in DrawElementTypeSimplifier
2017-02-03 17:43:42 +01:00
scrawl
853418db94
Remove redundant handling of Geode in DisplayRequirementsVisitor
2017-02-03 17:42:21 +01:00
scrawl
09ca132102
Remove redundant handling of Geode in SharedStateManager
2017-02-03 17:35:40 +01:00
Laurens Voerman
7b67ef0c6f
split travis-ci apple build into two jobs to avoid job time limit.
2017-02-03 10:01:15 +01:00
Kjell Andersson
f5483b0ad6
Bug fix to not crash when using shared context and adding / removing windowed views dynamically.
...
The GLExtension object is now reused instead of creating a new when allocating a state on the same ContextID. The static map that stores the GLExtensions is only reset when all references to the extension object are released.
2017-02-02 11:46:16 +01:00
OpenSceneGraph git repository
2a7d72c203
Merge pull request #191 from LaurensVoerman/glExtentions
...
GLExtensions.cpp: Fixed a few typo's in old function names.
2017-01-27 15:15:39 +00:00
Laurens Voerman
9183f275f5
Fixed a few old function names.
...
Check extensions trough extermination string - not by function pointer value.
Added a few validContext tests to ensure no functions or isExterntionSupported bool is set for an non valid context.
Remove duplicates / merge some lines.
Removed "GL_APPLE_texture_2D_limited_npot" form isNonPowerOfTwoTextureMipMappedSupported.
2017-01-25 17:05:56 +01:00
Robert Osfield
23da167c27
Fixed linking bug caused by repeated Program::addShader()/removeShader() operations invalidating the internal attach/dettech lists.
2017-01-24 17:36:36 +00:00
OpenSceneGraph git repository
d1e162a61f
Merge pull request #190 from scrawl/optimizer
...
Optimizer fixes
2017-01-24 09:27:07 +00:00
OpenSceneGraph git repository
00984d0e77
Merge pull request #189 from marchelbling/master
...
osgjs/gles updates
2017-01-24 09:15:26 +00:00
scrawl
f13fbff251
Remove CheckGeometryVisitor which was a no-op
2017-01-20 23:02:15 +01:00
scrawl
4a05caf4f7
MakeFastGeometryVisitor: fix handling of Geometries that are directly in the scene graph not attached to a Geode
2017-01-20 23:01:04 +01:00
scrawl
833f37ea57
StateVisitor: remove redundant code for Geode handling
2017-01-20 22:49:17 +01:00
scrawl
f229b19496
TessellateVisitor: fix handling of Geometries that are directly in the scene graph not attached to a Geode
2017-01-20 22:47:51 +01:00
scrawl
41cbf9a45e
FlattenStaticTransformsVisitor: fix handling of Drawables that are directly in the scene graph not attached to a Geode
2017-01-20 22:43:58 +01:00
scrawl
ff1a9a195a
StaticObjectDetectionVisitor: make use of apply(Drawable) visitor function
2017-01-20 21:48:45 +01:00
scrawl
764b2f60c6
TextureAtlasVisitor: fix handling of Drawables that are directly in the scene graph not attached to a Geode
2017-01-20 21:47:21 +01:00
scrawl
dc2689f779
TextureVisitor: remove redundant code for Geode handling
2017-01-20 21:47:13 +01:00
scrawl
4457df9a8a
RemoveEmptyNodesVisitor: add missing isOperationPermissible check
2017-01-20 21:46:46 +01:00
scrawl
7611f95078
RemoveEmptyNodesVisitor: remove redundant code for Geode handling
2017-01-20 21:46:03 +01:00
Robert Osfield
33f7500a59
Quitened down verbose debug messages
2017-01-20 17:31:09 +00:00
Robert Osfield
e5b493289d
Quitened down debug messages
2017-01-20 17:24:49 +00:00
Robert Osfield
ed596c3335
Quietened down some verbose debug messages
2017-01-20 17:07:55 +00:00
Marc Helbling
c84b667fa5
Updates osgjs from sketchfab
...
* updates uservalue serialization (avoid creating multie UserDataContainer for a same object)
* removes vec4ubarray specific serialization (serialization should not enforce the previous color transformation)
2017-01-20 15:17:16 +01:00
Marc Helbling
7cd7618e8c
Updates gles from sketchfab
...
* fixes bbox issue for animated scenes
* fixes geometry split (perf + line/point primitive management)
* removes degenerated faces
2017-01-20 15:15:31 +01:00
Robert Osfield
10b6f7aa47
Fixed indentation of comment
2017-01-19 15:56:57 +00:00
Robert Osfield
771efca5c6
Removed unused class
2017-01-16 17:18:58 +00:00
d-a-heitbrink
3d2f4ea404
Added support for Bindless texture extension,
...
64 bit uniforms, 64 bit buffers
Added new bindless texture example
2017-01-13 09:56:42 -06:00
d-a-heitbrink
18369bed2d
added code to deal with #extension for shader, added int64 and uint64 support
2017-01-13 09:33:49 -06:00
Robert Osfield
1af1b4dfda
Fixed smallTile test as it was checking against <=2^14 rather than <2^16 which is more conservative than required for a ushort container
2017-01-07 13:03:22 +00:00
OpenSceneGraph git repository
3cccdaddab
Merge pull request #184 from hwiesmann/master
...
BUG FIX - Wrong calculation of terrain normals in GeometryTechnique
2017-01-04 13:22:22 +00:00
Robert Osfield
b5c4f461bc
Fixed unitialized variable access to premature calling of computeMatrix().
2017-01-04 12:55:15 +00:00
Hartwig
192dcec5f9
Blending out of local functions
...
Some local functions are only needed for OS X compatibility. Define these functions only for OS X versions older than 10.6.
2017-01-01 16:33:37 +01:00
Hartwig
3c482467ea
BUG FIX - Wrong calculation of terrain normals
...
The partial derivative for the x-coordinate has been wrongly calculated: only a single sided derivative was calculated.
2016-12-29 21:43:20 +01:00
OpenSceneGraph git repository
d36302cb0c
Merge pull request #183 from rickyviking/master
...
Additional info when fail to load images
2016-12-23 17:23:07 +00:00
Robert Osfield
52fe86dcc9
From Hartwig Wiesmann, "ScalarsToColors returns a wrong color in case a value larger max is passed to getColor"
2016-12-23 17:16:16 +00:00
Riccardo Corsi
a526cab590
InputStream::readImage() : added info about which file failed to load when printing error message
2016-12-23 11:55:08 +01:00
OpenSceneGraph git repository
dc13d4d5dc
Merge pull request #182 from LaurensVoerman/fileStats
...
added some info about dynamic drawables and transparent bin to Statistics
2016-12-21 17:16:30 +00:00
Robert Osfield
28799b1ff6
Refactored the minimum width of bars.
2016-12-21 16:11:39 +00:00
OpenSceneGraph git repository
2b8bcf5475
Merge pull request #180 from LaurensVoerman/stats_bars
...
improve stats display
2016-12-21 16:04:24 +00:00
Laurens Voerman
7a39857ea7
added some info about dynamic drawables and transparent bin to Statistics
2016-12-21 16:58:02 +01:00
OpenSceneGraph git repository
960672d093
Merge pull request #181 from LaurensVoerman/DebugFPS
...
DEBUG FPS counter in red and named "DEBUG Frame Rate:"
2016-12-21 15:55:50 +00:00
OpenSceneGraph git repository
bf3def9303
Merge pull request #179 from LaurensVoerman/ktx_write_support
...
ktx write support
2016-12-21 15:54:20 +00:00
Robert Osfield
43e506a843
From Torben Dannhauer, "When compiling OSG with DCMTK on windows, it throws an compiler error due to a missing ws2_32.lib in the linker settings."
2016-12-21 15:33:02 +00:00
Robert Osfield
b950c428a6
From Vladimir Chebaev, "Dynamic linking of fbx plugin and fbx SDK"
2016-12-21 15:13:49 +00:00
Laurens Voerman
a9657bf5e8
DEBUG FPS counter in red and named "DEBUG Frame Rate:"
2016-12-21 15:58:09 +01:00
Laurens Voerman
f567d4702d
improve stats display
2016-12-21 15:47:04 +01:00
Laurens Voerman
c06c57e0db
ktx write support
2016-12-21 15:21:44 +01:00
Robert Osfield
723849c57c
From Andreas Ekstrand, "he attached ESRIShape.cpp contains a small fix in parsing of PointZ features, now correctly comparing with header content length which is defined in 16-bit words.
...
This should have been fixed in my old submission from 2012 but was probably overlooked due to an alternative way of comparing to a fix number for this feature type.
Without this fix, the plugin will only read one PointZ feature even if multiple features exist."
2016-12-21 11:41:36 +00:00
Robert Osfield
9478d27263
Changed Program::apply() to Program::compileGLObjects() to avoid the Program::apply() setting of setLastAppliedProgramObjects for affect current state.
2016-12-21 11:02:29 +00:00
Robert Osfield
ff8b5536a5
Added StateSet::setGlobalDefaults() to fix bug when osgViewer has stats on but no scene graph assigned
2016-12-21 09:10:50 +00:00
Robert Osfield
38c515a600
Fixed handling of #define's that are used as functions
2016-12-16 16:16:50 +00:00
OpenSceneGraph git repository
ca6578026a
Merge pull request #174 from etlapale/obj_plugin_improvements
...
Improvements for the OBJ writer plugin
2016-12-13 11:42:57 +00:00
Émilien Tlapale
34fb582074
Uncommenting missing argument.
2016-12-13 11:56:06 +01:00
Robert Osfield
d57a67e31c
Added header
2016-12-13 10:47:12 +00:00
Émilien Tlapale
d0fb365e25
Adding configurable precision for OBJ output.
2016-12-13 10:58:46 +01:00
Émilien Tlapale
f16853c7bb
Support for stateset in groups for OBJ.
2016-12-13 10:57:42 +01:00
Robert Osfield
d6c245a2f3
Added create angle of 20 degrees to SmoothingVisitor to improve visual quality.
...
Added geometry.setUseVertexBufferObjects(true) to geometry set up for improved performance.
Refactored the color set up so that by default it assigns just a single color to the geometry to improve performance.
2016-12-12 10:23:50 +00:00
Robert Osfield
3432f02d5f
Renamed the iges plugin to OpenCASCADE to make it clearer what the plugin is, and added file extension aliases for stp, step, igs and iges to the OpenCASCADE plugin to enable automatic loading.
2016-12-09 17:52:17 +00:00
Robert Osfield
61462dcf97
Added support for reading from STEP (.stp) files.
2016-12-09 17:29:55 +00:00
Robert Osfield
2b1477234e
Converted to unix line endings
2016-12-09 17:27:17 +00:00
OpenSceneGraph git repository
bb36fe7d3c
Merge pull request #170 from crubel/PThreadPullRequest
...
Fixed compile time errors that occur when you have ALLOW_PRIORITY_SCHEDULING defined
2016-12-05 10:33:23 +00:00
Curtis Rubel
98827b1d49
Missed the printf define at the top of this file.
...
Put back this:
#ifdef DEBUG
# define DPRINTF(arg) printf arg
#else
# define DPRINTF(arg)
#endif
I think that should do it now...
2016-12-02 08:07:15 -05:00
Curtis Rubel
c829ecf08f
Removed all OSGNOTIFY messages and put back all printf output as requested.
...
Sorry about this mixup, I was not aware that this particular directory was to be considered a separate project and must not rely on any dependencies from the rest of the OSG project. All OSGNOTIFY messages have been removed and the previous printf statements have been put back.
2016-12-02 08:05:30 -05:00
Alberto Luaces
b637d080d5
Several tweaks for compiling OpenCascade plugin:
...
* Remove unneeded XSDRAW.hxx header inclusion.
* Define WNT only on windows, because it is used for choosing between
win threads or pthreads.
2016-12-01 23:39:56 +01:00
Curtis Rubel
fab6bff310
Fixed compile time errors that occur when you have ALLOW_PRIORITY_SCHEDULING
...
defined. I also replaced all printf's with OSGNOTIFY to get this
more inline with the rest of OSG CGR
2016-12-01 16:36:20 -05:00
Robert Osfield
a9bc508dc4
From Abhishek Bansal, with ammendemts by Robet Osfield to get working with recent OpenCascade and usng CMake.
2016-11-30 19:11:15 +00:00
Robert Osfield
d4a4993285
Added GL_EXT_texture_border_clamp support for GLES
2016-11-30 17:18:33 +00:00
scrawl
1fffafb13a
Fix typo in StateSet::compileGLObjects, causing compilation of attributes to not be executed unless checkForGLErrors is true.
2016-11-26 01:09:45 +01:00
Robert Osfield
b04271f93e
Fixed crash in handling of an osg::Callback attached to a Drawable as update callback.
...
Added handling of osg::Callback when attavhed to a Drawable as a cull callback.
2016-11-23 18:19:59 +00:00
Robert Osfield
e89885a076
Added guards against division by zero
2016-11-15 17:36:21 +00:00
Robert Osfield
55f4778731
Added usage of GLExtensions::debugObjectLabel() to GLBufferObject::compile()
2016-11-15 14:52:59 +00:00
Robert Osfield
1abd99f084
Added support for glObjectLabel debugging
2016-11-15 14:35:47 +00:00
Robert Osfield
2f570ca3a9
Improved the indentation and case to make the code more consistent and readable
2016-11-15 11:16:03 +00:00
Robert Osfield
5aa897b5fd
Merge branch 'master' of https://github.com/fredowski/OpenSceneGraph into fredowski-master
2016-11-15 11:13:37 +00:00
Robert Osfield
137b596943
Enabled sharing of main threads processor affinity to the next required thread for CullDrawThreadPerCamera and CullThreadPerCameraDrawThreadPerContext
2016-11-15 11:01:41 +00:00
OpenSceneGraph git repository
5ff6048db0
Merge pull request #156 from LaurensVoerman/Affinity2
...
unlock cpu's 32-63 on 64 bit windows
2016-11-15 10:41:12 +00:00
Robert Osfield
87a3648e68
To avoid noise in documentation replaced nested namespaced enum with enum with FILE_COPY_ wording prefixed into enum values.
2016-11-15 08:57:24 +00:00
Robert Osfield
36b2ddac2d
Added usage of osg::ConfigureBufferObjectsVisitor to correct for incoherent buffer oject set up due to the adhoc way that the OpenFlight plugin sets up osg::Geometry.
2016-11-14 18:01:22 +00:00
Robert Osfield
5b375124cc
Added osg::Geometry::configureBufferObjects() and ConfigureBufferObjectsVisitor visitor to help with setting up buffer objects in a coherent fashion.
2016-11-14 17:59:25 +00:00
Robert Osfield
99cb8ebacf
Added more flexibility into the State::checkGLErrors() method, allowing calling code to pass in two strings.
...
Improved the StateSet::compileGLObjects() usage of checkGLErrors() to make the warning reports more meaningful.
2016-11-14 11:59:47 +00:00
Robert Osfield
e6052ef4b4
Added Dragger::applyAppropriateFrontFace(StateSet*) to make it easy to handle inverted matrices by toggling the FrontFace to sure the correct face is visible.
2016-11-11 17:18:13 +00:00
Robert Osfield
d16ca33f38
Fixed handling of Locator's with negative extents
2016-11-11 14:01:40 +00:00
Friedrich Beckmann
e506bb3075
added alternative to middle-mouse button in manipulator
...
I added CTRL + RIGHT-MOUSE-CLICK to the standard manipulator as
an alternative to MIDDLE-MOUSE-CLICK because a 3 Button Mouse
not always available, e.g. on MacOS. I tested this with the
osgAtlasSimbicon example.
2016-10-24 19:54:43 +02:00
Laurens Voerman
d461149969
re-assign thread affinity at the end of setThreadingModel()
2016-10-17 09:50:48 +02:00
Robert Osfield
e17ad60c2d
Added _color copy to the copy constructor
2016-10-14 18:00:40 +01:00
Laurens Voerman
16a282ccea
unlock cpu's 32-63 on 64 bit windows
2016-10-14 17:19:50 +02:00
Robert Osfield
afb046a196
Bumped OpenThreads version numbers to reflect changes in ABI
2016-10-13 17:43:29 +01:00
Robert Osfield
1cc53246e9
Changed appending of \n to be to the version line.
2016-10-12 17:24:25 +01:00
Robert Osfield
9072f9653e
Added OES variants of vertex array object functions
2016-10-12 16:10:40 +01:00
Robert Osfield
c92de93429
Altered the configureAffinity() scheme so that it places threads preferentially on even based number processors first, which should work better in case the processors available have hyper-threading
2016-10-12 10:08:56 +01:00
Robert Osfield
0314fd593a
Added VAO support to osgTerrain::GeometryPool
2016-10-11 20:11:39 +01:00
Robert Osfield
b6afce773a
Removed unneccessary includes
2016-10-11 20:11:24 +01:00
Robert Osfield
38ff11f8c5
Renamed ArrayDispatchers to AttributeDispatchers to better reflect it's role
2016-10-11 15:14:14 +01:00
Robert Osfield
e14ee80282
Streamlined the dispatch and activation of attribute dispatchers
2016-10-11 11:29:29 +01:00
Robert Osfield
364c838ea1
Removed unused vertex and texcoord array dispatchers
2016-10-11 11:29:29 +01:00
Fabian Wiesel
1f562c003c
Missed rename in VertexAttribArrayDispatch
...
The variable array is by initialisation a null-pointer, new_array is the new array
2016-10-11 11:29:29 +01:00
Robert Osfield
66873b8c6c
Fixed build errors when OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION to OFF
2016-10-11 11:29:29 +01:00
Robert Osfield
007a19a027
Fixed warnings
2016-10-11 11:29:29 +01:00
