[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34414] trunk/blender/source/blender/ blenkernel: no functional change,

[Campbell Barton]

Revision: 34414
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34414
Author:   campbellbarton
Date:     2011-01-20 07:44:58 +0000 (Thu, 20 Jan 2011)
Log Message:
-----------
no functional change,
- remove G.flag, its not used anywhere (and confusing with G.f).
- also remove strcpy where memory locations may overlap.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_global.h
    trunk/blender/source/blender/blenkernel/intern/blender.c

Modified: trunk/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_global.h	2011-01-20 07:41:25 UTC (rev 34413)
+++ trunk/blender/source/blender/blenkernel/BKE_global.h	2011-01-20 07:44:58 UTC (rev 34414)
@@ -92,10 +92,6 @@
 
 	/* ndof device found ? */
 	int ndofdevice;
-	
-	/* confusing... G.f and G.flags */
-	int flags;
-
 } Global;
 
 /* **************** GLOBAL ********************* */

Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c	2011-01-20 07:41:25 UTC (rev 34413)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c	2011-01-20 07:44:58 UTC (rev 34414)
@@ -299,8 +299,6 @@
 	/* 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));