Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Ewering <blender@instinctive.de>2006-11-18 04:45:47 +0300
committerAlexander Ewering <blender@instinctive.de>2006-11-18 04:45:47 +0300
commita94925809be8230c40c3d6c0666aa3c58349a2d8 (patch)
treeeaada55a7e0fdb865cf6f17ea07f916bc32261c5
parent41cb8f15eaf8a8db4d2a32a25d3c1c41bff8addd (diff)
Bugfix for:
http://projects.blender.org/tracker/index.php?func=detail&aid=4786&group_id=9&atid=125 If the path to Blender contained whitespace, various places which called the Blender executable wouldn't run. Now the path to the executable should be quoted correctly everywhere. If this breaks anything on other platforms, please shout :)
-rw-r--r--source/blender/python/api2_2x/sceneRender.c4
-rw-r--r--source/blender/src/buttons_scene.c2
-rw-r--r--source/blender/src/editimasel.c2
-rw-r--r--source/blender/src/filesel.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c
index 8ef3c09ab00..de5dd1c5f1e 100644
--- a/source/blender/python/api2_2x/sceneRender.c
+++ b/source/blender/python/api2_2x/sceneRender.c
@@ -514,14 +514,14 @@ PyObject *RenderData_Play( BPy_RenderData * self )
}
if( BLI_exist( file ) ) {
calc_renderwin_rectangle(640, 480, G.winpos, pos, size);
- sprintf( str, "%s -a -p %d %d \"%s\"", bprogname, pos[0],
+ sprintf( str, "\"%s\" -a -p %d %d \"%s\"", bprogname, pos[0],
pos[1], file );
system( str );
} else {
BKE_makepicstring( file, G.scene->r.pic, self->renderContext->sfra, G.scene->r.imtype);
if( BLI_exist( file ) ) {
calc_renderwin_rectangle(640, 480, G.winpos, pos, size);
- sprintf( str, "%s -a -p %d %d \"%s\"", bprogname,
+ sprintf( str, "\"%s\" -a -p %d %d \"%s\"", bprogname,
pos[0], pos[1], file );
system( str );
} else
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index 807320ca060..19e23f23377 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -483,7 +483,7 @@ static void run_playanim(char *file)
calc_renderwin_rectangle((G.scene->r.xsch*G.scene->r.size)/100,
(G.scene->r.ysch*G.scene->r.size)/100, G.winpos, pos, size);
- sprintf(str, "%s -a -p %d %d \"%s\"", bprogname, pos[0], pos[1], file);
+ sprintf(str, "\"%s\" -a -p %d %d \"%s\"", bprogname, pos[0], pos[1], file);
system(str);
}
diff --git a/source/blender/src/editimasel.c b/source/blender/src/editimasel.c
index 3d2b3c8b715..70572673d43 100644
--- a/source/blender/src/editimasel.c
+++ b/source/blender/src/editimasel.c
@@ -341,7 +341,7 @@ void winqreadimaselspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
if(G.qual & LR_SHIFTKEY) {
extern char bprogname[]; /* usiblender.c */
- sprintf(name, "%s -a \"%s%s\"", bprogname, simasel->dir, simasel->file);
+ sprintf(name, "\"%s\" -a \"%s%s\"", bprogname, simasel->dir, simasel->file);
system(name);
}
if(G.qual & LR_CTRLKEY) {
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c
index 7d25ca4dc5e..0e76083c08e 100644
--- a/source/blender/src/filesel.c
+++ b/source/blender/src/filesel.c
@@ -2105,7 +2105,7 @@ void winqreadfilespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
if(G.qual & LR_SHIFTKEY) {
extern char bprogname[]; /* usiblender.c */
- sprintf(str, "%s -a \"%s%s\"", bprogname, sfile->dir, sfile->file);
+ sprintf(str, "\"%s\" -a \"%s%s\"", bprogname, sfile->dir, sfile->file);
system(str);
}
else