[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55542] branches/soc-2008-mxcurioni/source /blender: Removed a Freestyle-specific function call from bf_windowmanager.

[Tamito Kajiyama]

Revision: 55542
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55542
Author:   kjym3
Date:     2013-03-23 21:38:35 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
Removed a Freestyle-specific function call from bf_windowmanager.
Suggested by Sergey Sharybin through a code review of the branch.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
    branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp	2013-03-23 17:28:24 UTC (rev 55541)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp	2013-03-23 21:38:35 UTC (rev 55542)
@@ -58,6 +58,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_callbacks.h"
 
 #include "BPY_extern.h"
 
@@ -90,6 +91,18 @@
 
 static string default_module_path;
 
+static void load_post_callback(struct Main *main, struct ID *id, void *arg)
+{
+	lineset_copied = false;
+}
+
+static bCallbackFuncStore load_post_callback_funcstore = {
+	NULL, NULL, /* next, prev */
+	load_post_callback, /* func */
+	NULL, /* arg */
+	0 /* alloc */
+};
+
 //=======================================================
 //   Initialization 
 //=======================================================
@@ -110,6 +123,8 @@
 	default_module_path = pathconfig->getProjectDir() + Config::DIR_SEP + "style_modules" +
 	                      Config::DIR_SEP + "contour.py";
 
+	BLI_callback_add(&load_post_callback_funcstore, BLI_CB_EVT_LOAD_POST);
+
 	freestyle_is_initialized = 1;
 }
 
@@ -121,11 +136,6 @@
 	controller->setContext(C);
 }
 
-void FRS_read_file(bContext *C)
-{
-	lineset_copied = false;
-}
-
 void FRS_exit()
 {
 	delete pathconfig;

Modified: branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt	2013-03-23 17:28:24 UTC (rev 55541)
+++ branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt	2013-03-23 21:38:35 UTC (rev 55542)
@@ -87,13 +87,6 @@
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-if(WITH_FREESTYLE)
-	list(APPEND INC
-		../freestyle
-	)
-	add_definitions(-DWITH_FREESTYLE)
-endif()
-
 if(WITH_OPENCOLLADA)
 	add_definitions(-DWITH_COLLADA)
 endif()

Modified: branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript	2013-03-23 17:28:24 UTC (rev 55541)
+++ branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript	2013-03-23 21:38:35 UTC (rev 55542)
@@ -69,10 +69,6 @@
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
-if env['WITH_BF_FREESTYLE']:
-    incs += ' ../freestyle'
-    defs.append('WITH_FREESTYLE')
-
 if env['WITH_BF_COMPOSITOR']:
     defs.append("WITH_COMPOSITOR")
 

Modified: branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c	2013-03-23 17:28:24 UTC (rev 55541)
+++ branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c	2013-03-23 21:38:35 UTC (rev 55542)
@@ -115,10 +115,6 @@
 #include "BPY_extern.h"
 #endif
 
-#ifdef WITH_FREESTYLE
-#  include "FRS_freestyle.h"
-#endif
-
 #include "WM_api.h"
 #include "WM_types.h"
 #include "wm.h"
@@ -438,9 +434,6 @@
 		BPY_app_handlers_reset(FALSE);
 		BPY_modules_load_user(C);
 #endif
-#ifdef WITH_FREESTYLE
-		FRS_read_file(C);
-#endif
 
 		/* important to do before NULL'ing the context */
 		BLI_callback_exec(CTX_data_main(C), NULL, BLI_CB_EVT_LOAD_POST);