• CGoGN GIT Supervisor's avatar
    Merge branch 'master' of /home/untereiner/CGoGN · c5e64b5b
    CGoGN GIT Supervisor authored
    * 'master' of /home/untereiner/CGoGN:
      Derniere changements
      import des fichiers de l'iness + IHM3
      Revert "Merge branch 'master' of cgogn:~thery/CGoGN"
      retour dans le namespace IHM
      encore quelques modifs sur les 3-cartes
    
    Conflicts:
    	Apps/Tuto/tuto5.cpp
    	include/Algo/Export/exportPov.h
    	include/Algo/ImplicitHierarchicalMesh/ihm3.hpp
    	include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
    	include/Utils/GLSLShader.h
    	include/Utils/text3d.h
    	src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
    	src/Utils/GLSLShader.cpp
    	src/Utils/text3d.cpp
    c5e64b5b
ihm3.h 7.74 KB