diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-20 10:44:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-20 10:44:58 +0300 |
commit | 09ceb859b7ea9945556ff40799375bd8139234e7 (patch) | |
tree | 28e97461b7b58afa25223fca79016a9612aa04e7 | |
parent | ac058624ae45d67f6260962882ea5f09c6afcea4 (diff) |
no functional change,
- remove G.flag, its not used anywhere (and confusing with G.f).
- also remove strcpy where memory locations may overlap.
-rw-r--r-- | source/blender/blenkernel/BKE_global.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index b23fbd3601c..d222fe8d296 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -92,10 +92,6 @@ typedef struct Global { /* ndof device found ? */ int ndofdevice; - - /* confusing... G.f and G.flags */ - int flags; - } Global; /* **************** GLOBAL ********************* */ diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index bc11c276210..6e08df0f465 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -299,8 +299,6 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, const char *filename /* these are the same at times, should never copy to the same location */ if(G.main->name != filename) BLI_strncpy(G.main->name, filename, FILE_MAX); - - BLI_strncpy(G.main->name, filename, FILE_MAX); /* is guaranteed current file */ /* baseflags, groups, make depsgraph, etc */ set_scene_bg(G.main, CTX_data_scene(C)); |