diff options
author | Ton Roosendaal <ton@blender.org> | 2009-01-04 17:14:06 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-01-04 17:14:06 +0300 |
commit | f7cb86df3a9ceccc4d649e42735732a608169157 (patch) | |
tree | 558a9ba43708a2213b1afa8f46d79f5daa140bc6 /source/blender/blenkernel/intern/text.c | |
parent | 74f9e98c828c17910405092785633373d4ae88e8 (diff) |
2.5
Think global, act local!
The old favorite G.scene gone! Man... that took almost 2 days.
Also removed G.curscreen and G.edbo.
Not everything could get solved; here's some notes.
- modifiers now store current scene in ModifierData. This is not
meant for permanent, but it can probably stick there until we
cleaned the anim system and depsgraph to cope better with
timing issues.
- Game engine G.scene should become an argument for staring it.
Didn't solve this yet.
- Texture nodes should get scene cfra, but the current implementation
is too tightly wrapped to do it easily.
Diffstat (limited to 'source/blender/blenkernel/intern/text.c')
-rw-r--r-- | source/blender/blenkernel/intern/text.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index d1d252ab210..999e1744ae6 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -322,7 +322,7 @@ int reopen_text(Text *text) return 1; } -Text *add_text(char *file) +Text *add_text(char *file, const char *relpath) { FILE *fp; int i, llen, len, res; @@ -334,8 +334,8 @@ Text *add_text(char *file) struct stat st; BLI_strncpy(str, file, FILE_MAXDIR+FILE_MAXFILE); - if (G.scene) /* can be NULL (bg mode) */ - BLI_convertstringcode(str, G.sce); + if (relpath) /* can be NULL (bg mode) */ + BLI_convertstringcode(str, relpath); BLI_split_dirfile_basic(str, NULL, sfile); fp= fopen(str, "r"); |