Robert Osfield
b0df75e674
Cleaned up the spacing and const of various method parameters.
...
Added non const versions of StateSet::getAttributePair() and getTextureAttributePair()
2016-09-20 17:01:26 +01:00
OpenSceneGraph git repository
57f9257f32
Merge pull request #136 from LaurensVoerman/Submissions11
...
disable warning C4589 for MSVC
2016-09-19 19:39:01 +01:00
Laurens Voerman
37bd1c6b93
disable warning C4589 for MSVC
2016-09-19 16:40:59 +02:00
OpenSceneGraph git repository
dd0cd8f2db
Merge pull request #130 from LaurensVoerman/Submissions7
...
VS2015 dae plugin fix a few declaration of 'X' hides previous
2016-09-15 07:53:10 +01:00
OpenSceneGraph git repository
b75546acaf
Merge pull request #131 from filnet/master
...
StandardManipulator: use proper bit mask when clearing a relative flag
2016-09-15 07:50:51 +01:00
Philippe Renon
e367792f6d
StandardManipulator: use proper bit mask when clearing a relative flag
2016-09-14 14:32:35 +02:00
Laurens Voerman
cf3c2b18e3
VS2015 fix a few warning C4456: declaration of 'X' hides previous local declaration
2016-09-13 17:07:28 +02:00
OpenSceneGraph git repository
3b1212fed5
Merge pull request #128 from LaurensVoerman/Submissions5
...
wrong Meta_Shape tag in ConvexHull
2016-09-12 16:22:54 +01:00
OpenSceneGraph git repository
22f96935fb
Merge pull request #127 from LaurensVoerman/Submissions4
...
remove last Performer reference
2016-09-12 16:22:18 +01:00
Laurens Voerman
55b8c380d8
wrong Meta_Shape tag in ConvexHull
2016-09-12 16:49:35 +02:00
Laurens Voerman
743ecf3706
remove last Performer reference
2016-09-09 10:58:19 +02:00
Robert Osfield
489860fb87
Updated version number to 3.5.5
2016-09-06 09:31:16 +01:00
Robert Osfield
aae78b8a8b
Updated ChangeLog formatting
2016-09-05 19:12:54 +01:00
Robert Osfield
beb617ad90
Updated ChangeLog, AUTHORS and README for 3.5.4 dev release
2016-09-05 17:57:27 +01:00
Robert Osfield
cb6e6ff2be
Fixed warnings, deprecated another out of date method
2016-09-05 15:35:54 +01:00
Robert Osfield
ec344a85b4
Fixed warnings
2016-09-05 13:44:59 +01:00
Stuart Mentzer
2c4a5319bf
Final version of FindFreetype.cmake that is based on the now-accepted CMake patches. This supports the new freetype include path structure and fixes the failure to find the debug library on Windows due to its name having a 'd' suffix.
2016-09-05 12:18:46 +01:00
Robert Osfield
a494cd71e8
Fixed typo
2016-09-05 07:59:15 +01:00
Robert Osfield
4a6fb5a49a
Fixed warnings
2016-09-04 19:50:28 +01:00
Robert Osfield
fb4f7a025b
Added local deprecated_osg::Geometry implementation from OpenSceneGraph-3.4 to keep build working now that deprecated_osg::Geometry has been removed from the core OSG.
2016-09-04 18:31:13 +01:00
Robert Osfield
19270d0833
Fixed warning
2016-09-02 19:09:13 +01:00
Robert Osfield
f4fbe6625a
Merge branch 'LaurensVoerman-Submissions2e'
2016-09-02 18:26:37 +01:00
Robert Osfield
79ff8ba273
Merge branch 'Submissions2e' of https://github.com/LaurensVoerman/OpenSceneGraph into LaurensVoerman-Submissions2e
2016-09-02 18:26:11 +01:00
OpenSceneGraph git repository
c19b271586
Merge pull request #119 from LaurensVoerman/Submissions2c
...
Fixed clone osgVolume::Scalarproperty and osg::TextureBuffer crash
2016-09-02 17:47:37 +01:00
OpenSceneGraph git repository
14bdadaf86
Merge pull request #123 from LaurensVoerman/Submissions2f
...
Submissions2f
2016-09-02 17:44:57 +01:00
OpenSceneGraph git repository
8d827ced1b
Merge pull request #117 from LaurensVoerman/Submissions2a
...
bugfix: wrong class name in META_Object macro for osg::Enablei /disable
2016-09-02 17:35:47 +01:00
OpenSceneGraph git repository
def6508308
Merge pull request #118 from LaurensVoerman/Submissions2b
...
fix colliding include guards and spurious #define OSGUI_EXPORT
2016-09-02 17:34:20 +01:00
OpenSceneGraph git repository
0873a69ff5
Merge pull request #124 from LaurensVoerman/Submissions3
...
RigTransformHardware fix: warn; don't crash if MAX_MATRIX not found
2016-09-02 17:28:40 +01:00
Laurens Voerman
92ca556243
fix the missing ")" in BasicAnimationManager copy constuctor
2016-08-29 17:00:00 +02:00
Laurens Voerman
1da43a5960
added copyconstructor for osgAnimation::BasicAnimationManager
2016-08-29 13:03:36 +02:00
Laurens Voerman
628f8fd9dc
added call to copy constructor for virtual base classes in copy constructor of derived classes, removed these for abstract classes
2016-08-29 10:41:40 +02:00
Laurens Voerman
d0020b7dfc
bugfix: osg::TextureBuffer::clone() crash
2016-08-29 10:01:48 +02:00
Laurens Voerman
0433d29d11
bugfix: osgVolume::ScalarProperty clone crash
2016-08-29 10:01:48 +02:00
Laurens Voerman
ca877a8424
fix colliding include guards and spurious #define OSGUI_EXPORT
2016-08-29 09:40:21 +02:00
Laurens Voerman
dd223002dd
bugfix: wrong class name in META_Object macro for osg::Enablei osg::Disablei
2016-08-29 09:37:14 +02:00
Robert Osfield
2e6f0d7aab
Quitened unused parameter warnings
2016-08-26 19:28:36 +01:00
Robert Osfield
0ad09d6dad
Fixed unused variable warnings
2016-08-26 19:18:00 +01:00
Robert Osfield
322adc266c
Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph
2016-08-26 18:00:52 +01:00
Robert Osfield
11ddd53eb4
Removed redundent Referenced::s/getThreadSafeReferenceCounting() and associated static and env vars as there are now inapprorpiate and no longer supported
2016-08-26 17:59:30 +01:00
Laurens Voerman
5c66ecfc99
RigTransformHardware fix: warn; don't crash if MAX_MATRIX not found
2016-08-16 14:33:48 +02:00
OpenSceneGraph git repository
2bdf56cb4b
Merge pull request #114 from scrawl/const-cast
...
Remove an unneeded const_cast
2016-08-16 12:40:35 +01:00
OpenSceneGraph git repository
15ec7e2ae7
Merge pull request #115 from zakalawe/master
...
Attempt to fix broken DLL exports from osgDB
2016-08-16 12:39:57 +01:00
James Turner
ea9f479674
Attempt to fix broken DLL exports from osgDB
...
Only export the osgDB method implementations, instead of the entire
class, and hence avoid exporting symbols from the base class, which
then conflict with other compilation units when linking.
This avoids the need for /FORCE:MULTIPLE linker option with MSVC.
2016-08-15 22:21:44 +01:00
Robert Osfield
8f68da89d7
Fixed handling in osgUtil::IncrementalCompileOperation/CompileSet/StateToCompile when the _markerObject is NULL.
2016-08-15 12:59:21 +01:00
Robert Osfield
9d9025a6b4
Changed the default paramter for the osgUtil::StateToCompile to retain the OSG-3.4 ABI and fixed indentation.
2016-08-15 12:13:07 +01:00
Robert Osfield
06cb31a3d2
Added automatic assignment of _markerObject to CompileSet.
2016-08-15 11:46:48 +01:00
scrawl
0b450a5113
Remove an unneeded const_cast
2016-08-14 19:30:55 +02:00
Ravi Mathur
e9d6737ec4
Updates to the CMake build system for Mac OSX
2016-08-10 14:30:28 +01:00
Anish Thomas
2b9dfab1fc
GLSL 1.3 support for vertex-attrib aliasing
2016-08-10 14:12:27 +01:00
Konstantin S. Matveyev
e6d4d99edb
Fixed filename encoding bug
2016-08-10 12:58:38 +01:00
