griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki 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

6
source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
View File

@@ -180,17 +180,17 @@ int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds)
return -1;
if( !obj1 ){
self->m = new Material();
self->m = new FrsMaterial();
} else if( BPy_FrsMaterial_Check(obj1) ) {
if( ((BPy_FrsMaterial *) obj1)->m )
self->m = new Material(*( ((BPy_FrsMaterial *) obj1)->m ));
self->m = new FrsMaterial(*( ((BPy_FrsMaterial *) obj1)->m ));
else
return -1;
} else if( PyFloat_Check(obj1) ) {
f1 = PyFloat_AsDouble(obj1);
self->m = new Material(&f1, &f2, &f3, &f4, f5);
self->m = new FrsMaterial(&f1, &f2, &f3, &f4, f5);
} else {
return -1;