[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57325] trunk/blender/source: code cleanup : group python reset functions in BPY_python_reset()

Campbell Barton ideasman42 at gmail.com
Mon Jun 10 01:31:54 CEST 2013


Revision: 57325
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57325
Author:   campbellbarton
Date:     2013-06-09 23:31:53 +0000 (Sun, 09 Jun 2013)
Log Message:
-----------
code cleanup: group python reset functions in BPY_python_reset()

Modified Paths:
--------------
    trunk/blender/source/blender/python/BPY_extern.h
    trunk/blender/source/blender/python/intern/bpy_interface.c
    trunk/blender/source/blender/windowmanager/intern/wm_files.c
    trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/source/blender/python/BPY_extern.h
===================================================================
--- trunk/blender/source/blender/python/BPY_extern.h	2013-06-09 21:29:20 UTC (rev 57324)
+++ trunk/blender/source/blender/python/BPY_extern.h	2013-06-09 23:31:53 UTC (rev 57325)
@@ -63,6 +63,7 @@
 
 void BPY_python_start(int argc, const char **argv);
 void BPY_python_end(void);
+void BPY_python_reset(struct bContext *C);
 
 /* 2.5 UI Scripts */
 int		BPY_filepath_exec(struct bContext *C, const char *filepath, struct ReportList *reports);

Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c	2013-06-09 21:29:20 UTC (rev 57324)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c	2013-06-09 23:31:53 UTC (rev 57325)
@@ -396,6 +396,13 @@
 
 }
 
+void BPY_python_reset(bContext *C)
+{
+	BPY_driver_reset();
+	BPY_app_handlers_reset(false);
+	BPY_modules_load_user(C);
+}
+
 static void python_script_error_jump_text(struct Text *text)
 {
 	int lineno;

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2013-06-09 21:29:20 UTC (rev 57324)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2013-06-09 23:31:53 UTC (rev 57325)
@@ -437,9 +437,7 @@
 
 #ifdef WITH_PYTHON
 		/* run any texts that were loaded in and flagged as modules */
-		BPY_driver_reset();
-		BPY_app_handlers_reset(FALSE);
-		BPY_modules_load_user(C);
+		BPY_python_reset(C);
 #endif
 
 		/* important to do before NULL'ing the context */
@@ -590,9 +588,7 @@
 		/* sync addons, these may have changed from the defaults */
 		BPY_string_exec(C, "__import__('addon_utils').reset_all()");
 
-		BPY_driver_reset();
-		BPY_app_handlers_reset(FALSE);
-		BPY_modules_load_user(C);
+		BPY_python_reset(C);
 	}
 #endif
 

Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2013-06-09 21:29:20 UTC (rev 57324)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2013-06-09 23:31:53 UTC (rev 57325)
@@ -174,10 +174,7 @@
 	BPY_context_set(C); /* necessary evil */
 	BPY_python_start(argc, argv);
 
-	BPY_driver_reset();
-	BPY_app_handlers_reset(FALSE); /* causes addon callbacks to be freed [#28068],
-	                                * but this is actually what we want. */
-	BPY_modules_load_user(C);
+	BPY_python_reset(C);
 #else
 	(void)argc; /* unused */
 	(void)argv; /* unused */

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2013-06-09 21:29:20 UTC (rev 57324)
+++ trunk/blender/source/creator/creator.c	2013-06-09 23:31:53 UTC (rev 57325)
@@ -1250,9 +1250,7 @@
 		/* WM_file_read() runs normally but since we're in background mode do here */
 #ifdef WITH_PYTHON
 		/* run any texts that were loaded in and flagged as modules */
-		BPY_driver_reset();
-		BPY_app_handlers_reset(FALSE);
-		BPY_modules_load_user(C);
+		BPY_python_reset(C);
 #endif
 
 		/* happens for the UI on file reading too (huh? (ton))*/




More information about the Bf-blender-cvs mailing list