Revision: 6093
          http://sourceforge.net/p/smartbody/code/6093
Author:   arishapiro
Date:     2015-06-03 18:37:36 +0000 (Wed, 03 Jun 2015)
Log Message:
-----------
Merged changes from trunk

Modified Paths:
--------------
    branches/javascript/core/smartbody/SmartBody/CMakeLists.txt
    branches/javascript/core/smartbody/SmartBody/SmartBody.vcxproj
    branches/javascript/core/smartbody/SmartBody/SmartBody.vcxproj.filters
    branches/javascript/core/smartbody/SmartBody/src/sb/SBScene.cpp
    branches/javascript/core/smartbody/SmartBody/src/sbm/GPU/SbmBlendFace.cpp
    branches/javascript/core/smartbody/SmartBody/src/sbm/GPU/SbmBlendFace.h
    branches/javascript/core/smartbody/SmartBody/src/sbm/ParserOpenCOLLADA.cpp
    branches/javascript/core/smartbody/SmartBody/src/sbm/sbm_deformable_mesh.cpp
    branches/javascript/core/smartbody/SmartBody/src/sbm/sbm_deformable_mesh.h
    branches/javascript/core/smartbody/SmartBody/src/sr/sr_gl_render_funcs.cpp
    branches/javascript/core/smartbody/sbgui/src/fltk_viewer.cpp
    branches/javascript/sdk/linux/src/CMakeLists.txt
    branches/javascript/sdk/osx/build/CMakeLists-SmartBody.txt

Added Paths:
-----------
    
branches/javascript/core/smartbody/SmartBody/src/sbm/GPU/shaderFiles/blendAllTexturesWithMask.frag
    
branches/javascript/core/smartbody/SmartBody/src/sbm/GPU/shaderFiles/blendAllTexturesWithMask.vert
    
branches/javascript/core/smartbody/SmartBody/src/sbm/GPU/shaderFiles/blendGeometryWithMasksFeedback.vert
    
branches/javascript/core/smartbody/SmartBody/src/sbm/GPU/shaderFiles/renderGeometryWithMask.frag
    
branches/javascript/core/smartbody/SmartBody/src/sbm/GPU/shaderFiles/renderGeometryWithMask.vert
    branches/javascript/core/smartbody/SmartBody/src/sbm/ParserASFAMC.cpp
    
branches/javascript/core/smartbody/SmartBody/src/sbm/ParserASFAMC_checkme.cpp
    branches/javascript/core/smartbody/SmartBody/src/sbm/ParserBVH.cpp
    branches/javascript/core/smartbody/SmartBody/src/sbm/ParserBVH_checkme.cpp

Removed Paths:
-------------
    branches/javascript/core/smartbody/SmartBody/src/sbm/ParserASFAMC.cpp
    branches/javascript/core/smartbody/SmartBody/src/sbm/ParserASFAMC.cxx
    branches/javascript/core/smartbody/SmartBody/src/sbm/ParserBVH.cpp
    branches/javascript/core/smartbody/SmartBody/src/sbm/ParserBVH.cxx

Property Changed:
----------------
    branches/javascript/
    branches/javascript/core/smartbody/
    branches/javascript/core/smartbody/sbgui/

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
_______________________________________________
Smartbody-svn mailing list
Smartbody-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/smartbody-svn

Reply via email to