bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Scons files for Boolop

Browse Source 
also a fix in BOP_Material so that MSVC won't complain about template issues
This commit is contained in:
Johnny Matthews 2005-10-29 13:26:31 +00:00
parent 607777d949
commit 1d366b3fe9
5 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intern/SConscript
View File

@ -9,6 +9,7 @@ SConscript(['SoundSystem/SConscript',
'memutil/SConscript/',
'decimation/SConscript',
'iksolver/SConscript',
'boolop/SConscript',
'elbeem/SConscript',
'opennl/SConscript'])

34
intern/boolop/SConscript Normal file
View File

@ -0,0 +1,34 @@
#!/usr/bin/python
Import ('user_options_dict')
Import ('library_env')
bop_env = library_env.Copy ()
source_files = [
'intern/BOP_BBox.cpp',
'intern/BOP_BSPNode.cpp',
'intern/BOP_BSPTree.cpp',
'intern/BOP_Edge.cpp',
'intern/BOP_Face.cpp',
'intern/BOP_Face2Face.cpp',
'intern/BOP_Interface.cpp',
'intern/BOP_Material.cpp',
'intern/BOP_MaterialContainer.cpp',
'intern/BOP_MathUtils.cpp',
'intern/BOP_Merge.cpp',
'intern/BOP_Mesh.cpp',
'intern/BOP_Segment.cpp',
'intern/BOP_Splitter.cpp',
'intern/BOP_Tag.cpp',
'intern/BOP_Triangulator.cpp',
'intern/BOP_Vertex.cpp'
]
bop_env.Append (CPPPATH = [ '.',
'intern',
'extern',
'#intern/moto/include',
'#intern/container',
'#intern/memutil'])
bop_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_BOP', source=source_files)

2
intern/boolop/intern/BOP_Material.cpp
View File

@ -117,7 +117,7 @@ void BOP_Material::duplicate(const BOP_Material& other)
/**
* Implements operator =
*/
BOP_Material& BOP_Material::operator = (BOP_Material& other)
BOP_Material& BOP_Material::operator = (const BOP_Material& other)
{
if (other.getFaceWidth() == m_faceWidth && other.getFaceVertexWidth() == m_faceVertexWidth)
duplicate(other);

2
intern/boolop/intern/BOP_Material.h
View File

@ -55,7 +55,7 @@ public:
void setFaceVertexMaterial(char* faceVertexMaterial);
void setFaceVertexMaterial(char* faceVertexMaterial, int i);
void duplicate(const BOP_Material& other);
BOP_Material& operator = (BOP_Material& other);
BOP_Material& operator = (const BOP_Material& other);
char* getFaceMaterial() const;
char* getFaceVertexMaterial(int i) const;
int getFaceWidth() const { return m_faceWidth; };

1
tools/scons/bs/bs_libs.py
View File

@ -14,6 +14,7 @@ def common_libs(env):
env.Append (LIBS=[
'blender_readblenfile',
'blender_img',
'blender_bop',
'blender_blenkernel',
'blender_blenloader',
'blender_blenpluginapi',