diff options
| -rw-r--r-- | source/blender/freestyle/FRS_freestyle.h | 2 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp | 5 | ||||
| -rw-r--r-- | source/blender/src/usiblender.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index cc52685663c..731e5f8ad80 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -26,7 +26,7 @@ extern "C" { extern float* freestyle_dkr_epsilon; // Rendering - void FRS_initialize( short select_layer ); + void FRS_initialize(); void FRS_add_Freestyle(Render* re); void FRS_exit(); diff --git a/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp b/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp index 23e66d52cf2..4483fb1e22d 100644 --- a/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/app_blender/FRS_freestyle.cpp @@ -55,7 +55,7 @@ extern "C" { // Initialization //======================================================= - void FRS_initialize( short select_layer ){ + void FRS_initialize(){ if( !freestyle_is_initialized ) { @@ -69,8 +69,7 @@ extern "C" { freestyle_is_initialized = 1; } - if( select_layer ) - FRS_select_layer( (SceneRenderLayer*) BLI_findlink(&G.scene->r.layers, G.scene->r.actlay) ); + FRS_select_layer( (SceneRenderLayer*) BLI_findlink(&G.scene->r.layers, G.scene->r.actlay) ); } diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 7a7a601c01d..5cd369ea937 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -605,7 +605,7 @@ void BIF_read_file(char *name) if (retval!=0) G.relbase_valid = 1; - FRS_initialize( 1 ); + FRS_initialize(); undo_editmode_clear(); undo_imagepaint_clear(); @@ -681,7 +681,7 @@ int BIF_read_homefile(int from_memory) init_userdef_file(); - FRS_initialize( 1 ); + FRS_initialize(); undo_editmode_clear(); undo_imagepaint_clear(); |