archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

soc-2008-mxcurioni: first version of lib3ds code. It does NOT work yet and has to be debugged. It can be activate in app_blender/api.cpp by replacing the FRS_scene_3ds_export call in FRS_prepare, by FRS_load_mesh.

Browse Source 
All of the reference to the original Material class were renamed to FrsMaterial to resolve a name collision with Blender. To keep the window context necessary to draw the strokes after RE_Database_FromScene has been called, the display_clear function is used.
This commit is contained in:
Maxime Curioni
2008-08-07 15:04:25 +00:00
parent 1baf09110b
commit 9a1217e559
47 changed files with 833 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
View File

@@ -166,21 +166,21 @@ PyObject * FEdgeSharp_normalB( BPy_FEdgeSharp *self ) {
}
PyObject * FEdgeSharp_aMaterialIndex( BPy_FEdgeSharp *self ) {
return PyInt_FromLong( self->fes->aMaterialIndex() );
return PyInt_FromLong( self->fes->aFrsMaterialIndex() );
}
PyObject * FEdgeSharp_bMaterialIndex( BPy_FEdgeSharp *self ) {
return PyInt_FromLong( self->fes->bMaterialIndex() );
return PyInt_FromLong( self->fes->bFrsMaterialIndex() );
}
PyObject * FEdgeSharp_aMaterial( BPy_FEdgeSharp *self ) {
Material m( self->fes->aMaterial() );
return BPy_FrsMaterial_from_Material(m);
FrsMaterial m( self->fes->aFrsMaterial() );
return BPy_FrsMaterial_from_FrsMaterial(m);
}
PyObject * FEdgeSharp_bMaterial( BPy_FEdgeSharp *self ) {
Material m( self->fes->aMaterial() );
return BPy_FrsMaterial_from_Material(m);
FrsMaterial m( self->fes->aFrsMaterial() );
return BPy_FrsMaterial_from_FrsMaterial(m);
}
PyObject * FEdgeSharp_setNormalA( BPy_FEdgeSharp *self, PyObject *args ) {
@@ -225,7 +225,7 @@ PyObject * FEdgeSharp_setaMaterialIndex( BPy_FEdgeSharp *self, PyObject *args )
Py_RETURN_NONE;
}
self->fes->setaMaterialIndex( i );
self->fes->setaFrsMaterialIndex( i );
Py_RETURN_NONE;
}
@@ -238,7 +238,7 @@ PyObject * FEdgeSharp_setbMaterialIndex( BPy_FEdgeSharp *self, PyObject *args )
Py_RETURN_NONE;
}
self->fes->setbMaterialIndex( i );
self->fes->setbFrsMaterialIndex( i );
Py_RETURN_NONE;
}