[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39016] trunk/blender/source/blender: remove append to cursor code, wasnt used and made some naive assumptions about object locations.

Campbell Barton ideasman42 at gmail.com
Thu Aug 4 13:27:14 CEST 2011


Revision: 39016
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39016
Author:   campbellbarton
Date:     2011-08-04 11:27:13 +0000 (Thu, 04 Aug 2011)
Log Message:
-----------
remove append to cursor code, wasnt used and made some naive assumptions about object locations.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/makesdna/DNA_space_types.h

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-08-04 10:05:14 UTC (rev 39015)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-08-04 11:27:13 UTC (rev 39016)
@@ -12999,54 +12999,7 @@
 	return library_append_begin(C, &fd, filepath);
 }
 
-static void append_do_cursor(Scene *scene, Library *curlib, short flag)
-{
-	Base *centerbase;
-	Object *ob;
-	float *curs, centerloc[3], vec[3], min[3], max[3];
-	int count= 0;
 
-	/* when not linking (appending)... */
-	if(flag & FILE_LINK) 
-		return;
-
-	/* we're not appending at cursor */
-	if((flag & FILE_ATCURSOR) == 0) 
-		return;
-	
-	/* find the center of everything appended */
-	INIT_MINMAX(min, max);
-	centerbase= (scene->base.first);
-	while(centerbase) {
-		if(centerbase->object->id.lib==curlib && centerbase->object->parent==NULL) {
-			VECCOPY(vec, centerbase->object->loc);
-			DO_MINMAX(vec, min, max);
-			count++;
-		}
-		centerbase= centerbase->next;
-	}
-	/* we haven't found any objects to move to cursor */
-	if(!count) 
-		return;
-	
-	/* move from the center of the appended objects to cursor */
-	mid_v3_v3v3(centerloc, min, max);
-	curs = scene->cursor;
-	VECSUB(centerloc,curs,centerloc);
-	
-	/* now translate the center of the objects */
-	centerbase= (scene->base.first);
-	while(centerbase) {
-		if(centerbase->object->id.lib==curlib && centerbase->object->parent==NULL) {
-			ob= centerbase->object;
-			ob->loc[0] += centerloc[0];
-			ob->loc[1] += centerloc[1];
-			ob->loc[2] += centerloc[2];
-		}
-		centerbase= centerbase->next;
-	}
-}
-
 /* Context == NULL signifies not to do any scene manipulation */
 static void library_append_end(const bContext *C, Main *mainl, FileData **fd, int idcode, short flag)
 {
@@ -13099,8 +13052,6 @@
 		else {
 			printf("library_append_end, scene is NULL (objects wont get bases)\n");
 		}
-
-		append_do_cursor(scene, curlib, flag);
 	}
 	/* has been removed... erm, why? s..ton) */
 	/* 20040907: looks like they are give base already in append_named_part(); -Nathan L */

Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h	2011-08-04 10:05:14 UTC (rev 39015)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h	2011-08-04 11:27:13 UTC (rev 39016)
@@ -703,7 +703,7 @@
 #define FILE_HIDE_DOT		(1<<3)
 #define FILE_AUTOSELECT		(1<<4)
 #define FILE_ACTIVELAY		(1<<5)
-#define FILE_ATCURSOR		(1<<6)
+/* #define FILE_ATCURSOR	(1<<6) */ /* deprecated */
 #define FILE_DIRSEL_ONLY	(1<<7)
 #define FILE_FILTER			(1<<8)
 #define FILE_BOOKMARKS		(1<<9)




More information about the Bf-blender-cvs mailing list