OCCT Git - occt-copy.git/commit

]> OCCT Git - occt-copy.git/commit

author	nds <nds@opencascade.com>
	Thu, 27 Sep 2018 15:19:06 +0000 (18:19 +0300)
committer	nds <nds@opencascade.com>
	Wed, 7 Nov 2018 16:37:37 +0000 (19:37 +0300)
commit	7b84779d430be6e6bb2ebf7b24d9d8c1b7954d19
tree	c306306cb8d3e72e7a949c3029f23c24c90aa128	tree \| snapshot (tar.gz zip)
parent	ab078490cdc21bdcb344f94dcea9494a7db2f2c8	commit \| diff

#265 Possibility to display materials by different hatching style when we make clipping

Conflicts:
src/Graphic3d/Graphic3d_ClipPlane.cxx
src/Graphic3d/Graphic3d_ClipPlane.hxx
src/OpenGl/OpenGl_CappingAlgo.cxx
src/OpenGl/OpenGl_CappingAlgo.hxx
src/OpenGl/OpenGl_CappingPlaneResource.cxx
src/OpenGl/OpenGl_Element.hxx
src/OpenGl/OpenGl_Workspace.cxx
src/ViewerTest/ViewerTest_ViewerCommands.cxx

(cherry picked from commit 24616c50906ed16c8c1ef60229b6c47d39b7887e)

Conflicts:
src/AIS/AIS_InteractiveObject.cxx
src/OpenGl/OpenGl_Group.cxx
src/OpenGl/OpenGl_Group.hxx

24 files changed:

data/images/hatch_1.png		diff \| blob \| blame \| history
src/AIS/AIS_ColoredShape.cxx		diff \| blob \| blame \| history
src/AIS/AIS_InteractiveObject.cxx		diff \| blob \| blame \| history
src/AIS/AIS_InteractiveObject.hxx		diff \| blob \| blame \| history
src/AIS/AIS_Shape.cxx		diff \| blob \| blame \| history
src/Graphic3d/FILES		diff \| blob \| blame \| history
src/Graphic3d/Graphic3d_AspectFillCapping.cxx	[new file with mode: 0644]	blob
src/Graphic3d/Graphic3d_AspectFillCapping.hxx	[new file with mode: 0644]	blob
src/Graphic3d/Graphic3d_ClipPlane.cxx		diff \| blob \| blame \| history
src/Graphic3d/Graphic3d_ClipPlane.hxx		diff \| blob \| blame \| history
src/Graphic3d/Graphic3d_Group.cxx		diff \| blob \| blame \| history
src/Graphic3d/Graphic3d_Group.hxx		diff \| blob \| blame \| history
src/Graphic3d/Graphic3d_GroupAspect.hxx		diff \| blob \| blame \| history
src/NCollection/NCollection_Mat4.hxx		diff \| blob \| blame \| history
src/OpenGl/OpenGl_CappingAlgo.cxx		diff \| blob \| blame \| history
src/OpenGl/OpenGl_CappingPlaneResource.cxx		diff \| blob \| blame \| history
src/OpenGl/OpenGl_CappingPlaneResource.hxx		diff \| blob \| blame \| history
src/OpenGl/OpenGl_Group.hxx		diff \| blob \| blame \| history
src/OpenGl/OpenGl_ShaderManager.cxx		diff \| blob \| blame \| history
src/StdPrs/StdPrs_ShadedShape.cxx		diff \| blob \| blame \| history
src/StdPrs/StdPrs_ShadedShape.hxx		diff \| blob \| blame \| history
src/ViewerTest/ViewerTest_ViewerCommands.cxx		diff \| blob \| blame \| history
tests/bugs/vis/bug24224		diff \| blob \| blame \| history
tests/bugs/vis/bug27751_capping		diff \| blob \| blame \| history

Test copy of Open CASCADE Technology repository

RSS Atom