[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13786] trunk/blender/source/blender: Python Bugfix
Campbell Barton
ideasman42 at gmail.com
Wed Feb 20 19:56:07 CET 2008
Revision: 13786
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13786
Author: campbellbarton
Date: 2008-02-20 19:56:07 +0100 (Wed, 20 Feb 2008)
Log Message:
-----------
Python Bugfix
A new file could have its Blender.Get("filename") return "<memory>" after undo'ing on an open file.
Fix for own error with python sys.path, messed up game engine.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/python/BPY_interface.c
trunk/blender/source/blender/python/api2_2x/Blender.c
trunk/blender/source/blender/python/api2_2x/sceneRender.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/src/buttons_scene.c
trunk/blender/source/blender/src/previewrender.c
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2008-02-20 16:07:42 UTC (rev 13785)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2008-02-20 18:56:07 UTC (rev 13786)
@@ -482,7 +482,7 @@
if (type_r)
*((BlenFileType*)type_r)= bfd->type;
- setup_app_data(bfd, "<memory>");
+ setup_app_data(bfd, "<memory2>");
} else {
error("Loading failed: %s", BLO_bre_as_string(bre));
}
@@ -504,7 +504,7 @@
bfd= BLO_read_from_memfile(G.sce, memfile, &bre);
if (bfd) {
- setup_app_data(bfd, "<memory>");
+ setup_app_data(bfd, "<memory1>");
} else {
error("Loading failed: %s", BLO_bre_as_string(bre));
}
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2008-02-20 16:07:42 UTC (rev 13785)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2008-02-20 18:56:07 UTC (rev 13786)
@@ -575,7 +575,9 @@
/* fbuf obsolete... */
#define R_FBUF 0x40000
/* threads obsolete... is there for old files, now use for autodetect threads */
-#define R_THREADS 0x80000
+#define R_THREADS 0x80000
+ /* Use the same flag for autothreads */
+#define R_AUTO_THREADS 0x80000
#define R_SPEED 0x100000
#define R_SSS 0x200000
Modified: trunk/blender/source/blender/python/BPY_interface.c
===================================================================
--- trunk/blender/source/blender/python/BPY_interface.c 2008-02-20 16:07:42 UTC (rev 13785)
+++ trunk/blender/source/blender/python/BPY_interface.c 2008-02-20 18:56:07 UTC (rev 13786)
@@ -377,7 +377,7 @@
d = PyModule_GetDict( mod ); /* borrowed ref */
EXPP_dict_set_item_str( d, "executable", Py_BuildValue( "s", bprogname ) );
- if (first_time) {
+ if (bpy_orig_syspath_List == NULL) {
/* backup the original sys.path to rebuild later */
PyObject *syspath = PyDict_GetItemString( d, "path" ); /* borrowed ref */
if (bpy_orig_syspath_List) { /* This should never happen but just incase, be nice */
@@ -401,12 +401,12 @@
mod = PyImport_ImportModule( "sys" );
if (!mod) {
- printf("error: could not import python sys module. some modules may not import.");
+ printf("error: could not import python sys module. some modules may not import.\n");
return;
}
if (!bpy_orig_syspath_List) { /* should never happen */
- printf("error refershing python path");
+ printf("error refershing python path\n");
Py_DECREF(mod);
return;
}
Modified: trunk/blender/source/blender/python/api2_2x/Blender.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Blender.c 2008-02-20 16:07:42 UTC (rev 13785)
+++ trunk/blender/source/blender/python/api2_2x/Blender.c 2008-02-20 18:56:07 UTC (rev 13786)
@@ -341,10 +341,10 @@
else if( StringEqual( str, "endframe" ) )
ret = PyInt_FromLong( G.scene->r.efra );
else if( StringEqual( str, "filename" ) ) {
- if ( strstr(G.main->name, ".B.blend") != 0)
+ if (!G.relbase_valid)
ret = PyString_FromString("");
else
- ret = PyString_FromString(G.main->name);
+ ret = PyString_FromString(G.sce);
}
else if( StringEqual( str, "homedir" ) ) {
char *hdir = bpy_gethome(0);
Modified: trunk/blender/source/blender/python/api2_2x/sceneRender.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/sceneRender.c 2008-02-20 16:07:42 UTC (rev 13785)
+++ trunk/blender/source/blender/python/api2_2x/sceneRender.c 2008-02-20 18:56:07 UTC (rev 13786)
@@ -2089,7 +2089,7 @@
#define MODE_MASK ( R_OSA | R_SHADOW | R_GAMMA | R_ENVMAP | R_EDGE | \
R_FIELDS | R_FIELDSTILL | R_RADIO | R_BORDER | R_PANORAMA | R_CROP | \
- R_ODDFIELD | R_MBLUR | R_RAYTRACE | R_THREADS )
+ R_ODDFIELD | R_MBLUR | R_RAYTRACE | R_AUTO_THREADS )
static PyObject *RenderData_getMode( BPy_RenderData *self )
{
@@ -2593,10 +2593,13 @@
(getter)RenderData_getModeBit, (setter)RenderData_setModeBit,
"Skip rendering existing image files",
(void *)R_NO_OVERWRITE},
-
+ {"autoThreads",
+ (getter)RenderData_getModeBit, (setter)RenderData_setModeBit,
+ "Use system number of processors",
+ (void *)R_AUTO_THREADS},
/* R_GAUSS unused */
/* R_FBUF unused */
-/* R_THREADS unused */
+/* R_AUTO_THREADS unused */
{"threads",
(getter)RenderData_getThreads, (setter)RenderData_setThreads,
"Number of threads used to render",
@@ -3718,7 +3721,7 @@
PyConstant_Insert( d, "ODDFIELD", PyInt_FromLong( R_ODDFIELD ) );
PyConstant_Insert( d, "MBLUR", PyInt_FromLong( R_MBLUR ) );
PyConstant_Insert( d, "RAYTRACING", PyInt_FromLong( R_RAYTRACE ) );
- PyConstant_Insert( d, "THREADS", PyInt_FromLong( R_THREADS ) );
+ PyConstant_Insert( d, "AUTOTHREADS", PyInt_FromLong( R_AUTO_THREADS ) );
}
return M;
}
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c 2008-02-20 16:07:42 UTC (rev 13785)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c 2008-02-20 18:56:07 UTC (rev 13786)
@@ -1108,7 +1108,7 @@
/* we clip faces with a minimum of 2 pixel boundary outside of image border. see zbuf.c */
re->clipcrop= 1.0f + 2.0f/(float)(re->winx>re->winy?re->winy:re->winx);
- if (rd->mode & R_THREADS || commandline_threads == 0) { /* Automatic threads */
+ if (rd->mode & R_AUTO_THREADS || commandline_threads == 0) { /* Automatic threads */
re->r.threads = BLI_system_thread_count();
} else if(commandline_threads >= 1 && commandline_threads<=BLENDER_MAX_THREADS) {
re->r.threads= commandline_threads;
Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c 2008-02-20 16:07:42 UTC (rev 13785)
+++ trunk/blender/source/blender/src/buttons_scene.c 2008-02-20 18:56:07 UTC (rev 13786)
@@ -2023,8 +2023,8 @@
uiBlockEndAlign(block);
uiBlockBeginAlign(block);
- uiDefIconButBitI(block, TOG, R_THREADS, B_REDR, ICON_AUTO, 10, 63, 20, 20, &G.scene->r.mode, 0.0, 0.0, 0, 0, "Automatic threads from system");
- if (G.scene->r.mode & R_THREADS) {
+ uiDefIconButBitI(block, TOG, R_AUTO_THREADS, B_REDR, ICON_AUTO, 10, 63, 20, 20, &G.scene->r.mode, 0.0, 0.0, 0, 0, "Automatically set the threads to the number of processors on the system");
+ if (G.scene->r.mode & R_AUTO_THREADS) {
char thread_str[16];
sprintf(thread_str, " Threads: %d", BLI_system_thread_count());
uiDefBut(block, LABEL, 0, thread_str, 30, 63,80,20, 0, 0, 0, 0, 0, "");
Modified: trunk/blender/source/blender/src/previewrender.c
===================================================================
--- trunk/blender/source/blender/src/previewrender.c 2008-02-20 16:07:42 UTC (rev 13785)
+++ trunk/blender/source/blender/src/previewrender.c 2008-02-20 18:56:07 UTC (rev 13786)
@@ -264,8 +264,6 @@
sce= pr_main->scene.first;
if(sce) {
-
- // sce->r.mode |= G.scene->r.mode & R_THREADS;
/* this flag tells render to not execute depsgraph or ipos etc */
sce->r.scemode |= R_PREVIEWBUTS;
/* set world always back, is used now */
More information about the Bf-blender-cvs
mailing list