Changeset 51

Show
Ignore:
Timestamp:
09/05/06 14:18:13 (2 years ago)
Author:
dirk
Message:

Regen after Allen's fix.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/scons_build_creation/Source/System/NodeCores/Drawables/Base/OSGMaterialDrawableBase.cpp

    r2 r51  
    346346namespace 
    347347{ 
    348     static Char8 cvsid_cpp       [] = "@(#)$Id: OSGMaterialDrawableBase.cpp,v 1.3.4.10 2006/08/01 08:48:56 vossg Exp $"; 
     348    static Char8 cvsid_cpp       [] = "@(#)$Id: $"; 
    349349    static Char8 cvsid_hpp       [] = OSGMATERIALDRAWABLEBASE_HEADER_CVSID; 
    350350    static Char8 cvsid_inl       [] = OSGMATERIALDRAWABLEBASE_INLINE_CVSID; 

  • branches/scons_build_creation/Source/System/NodeCores/Drawables/Base/OSGMaterialDrawableBase.h

    r2 r51  
    6060 
    6161#include "OSGConfig.h" 
    62 #include "OSGSystemDef.h" 
     62#include "OSGDrawableDef.h" 
    6363 
    6464#include "OSGBaseTypes.h" 
    …… 
    7676//! \brief MaterialDrawable Base Class. 
    7777 
    78 class OSG_SYSTEM_DLLMAPPING MaterialDrawableBase : public Drawable 
     78class OSG_DRAWABLE_DLLMAPPING MaterialDrawableBase : public Drawable 
    7979{ 
    8080  public: 
    …… 
    325325OSG_END_NAMESPACE 
    326326 
    327 #define OSGMATERIALDRAWABLEBASE_HEADER_CVSID "@(#)$Id: OSGMaterialDrawableBase.h,v 1.3.4.11 2006/08/01 08:48:56 vossg Exp $" 
     327#define OSGMATERIALDRAWABLEBASE_HEADER_CVSID "@(#)$Id: $" 
    328328 
    329329#endif /* _OSGMATERIALDRAWABLEBASE_H_ */ 

  • branches/scons_build_creation/Source/System/NodeCores/Drawables/Base/OSGMaterialDrawableBase.inl

    r2 r51  
    146146OSG_END_NAMESPACE 
    147147 
    148 #define OSGMATERIALDRAWABLEBASE_INLINE_CVSID "@(#)$Id: OSGMaterialDrawableBase.inl,v 1.3.4.8 2006/08/01 08:48:56 vossg Exp $" 
     148#define OSGMATERIALDRAWABLEBASE_INLINE_CVSID "@(#)$Id: $" 
    149149 

  • branches/scons_build_creation/Source/System/NodeCores/Drawables/Base/OSGMaterialDrawableFields.h

    r2 r51  
    5656 
    5757#include "OSGConfig.h" 
    58 #include "OSGSystemDef.h" 
     58#include "OSGDrawableDef.h" 
    5959 
    6060#include "OSGDrawableFields.h" 
    …… 
    9393 
    9494#if !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3) 
    95 /*! \ingroup GrpSystemFieldTraits 
     95/*! \ingroup GrpDrawableFieldTraits 
    9696 */ 
    9797#if !defined(OSG_DOC_DEV_TRAITS) 
    …… 
    113113    enum                        { StringConvertable = 0x00 }; 
    114114 
    115     static OSG_SYSTEM_DLLMAPPING  
     115    static OSG_DRAWABLE_DLLMAPPING  
    116116                     DataType &getType (void); 
    117117 
    …… 
    130130 
    131131#if !defined(OSG_DO_DOC) || defined(OSG_DOC_FIELD_TYPEDEFS) 
    132 /*! \ingroup GrpSystemFieldSingle */ 
     132/*! \ingroup GrpDrawableFieldSingle */ 
    133133 
    134134typedef SFieldAdaptor<MaterialDrawablePtr, SFFieldContainerPtr> SFMaterialDrawablePtr; 
    …… 
    136136 
    137137#ifndef OSG_COMPILEMATERIALDRAWABLEINST 
    138 OSG_FIELD_DLLEXPORT_DECL1(SField, MaterialDrawablePtr, OSG_SYSTEM_DLLTMPLMAPPING) 
     138OSG_FIELD_DLLEXPORT_DECL1(SField, MaterialDrawablePtr, OSG_DRAWABLE_DLLTMPLMAPPING) 
    139139#endif 
    140140 
    141141#if !defined(OSG_DO_DOC) || defined(OSG_DOC_FIELD_TYPEDEFS) 
    142 /*! \ingroup GrpSystemFieldMulti */ 
     142/*! \ingroup GrpDrawableFieldMulti */ 
    143143 
    144144typedef MFieldAdaptor<MaterialDrawablePtr, MFFieldContainerPtr> MFMaterialDrawablePtr; 
    …… 
    146146 
    147147#ifndef OSG_COMPILEMATERIALDRAWABLEINST 
    148 OSG_FIELD_DLLEXPORT_DECL1(MField, MaterialDrawablePtr, OSG_SYSTEM_DLLTMPLMAPPING) 
     148OSG_FIELD_DLLEXPORT_DECL1(MField, MaterialDrawablePtr, OSG_DRAWABLE_DLLTMPLMAPPING) 
    149149#endif 
    150150 
    151151OSG_END_NAMESPACE 
    152152 
    153 #define OSGMATERIALDRAWABLEFIELDS_HEADER_CVSID "@(#)$Id: OSGMaterialDrawableFields.h,v 1.4.4.9 2006/08/01 08:48:56 vossg Exp $" 
     153#define OSGMATERIALDRAWABLEFIELDS_HEADER_CVSID "@(#)$Id: $" 
    154154 
    155155#endif /* _OSGMATERIALDRAWABLEFIELDS_H_ */