[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11763] branches/soc-2007-mosani/source/ blender: This is the last commit for the official SOC.

[Aaron Moore]

Revision: 11763
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11763
Author:   mosani
Date:     2007-08-21 08:06:12 +0200 (Tue, 21 Aug 2007)

Log Message:
-----------
This is the last commit for the official SOC.
 I've taken out the test code printfs and fixed
 a small dependency error in the aqsis plugin.

Modified Paths:
--------------
    branches/soc-2007-mosani/source/blender/blenpluginapi/intern/pluginapi.c
    branches/soc-2007-mosani/source/blender/render/render_api/plugins/aqsis/aqsis_plugin.c
    branches/soc-2007-mosani/source/blender/render/render_api/source/RND_internal.c

Modified: branches/soc-2007-mosani/source/blender/blenpluginapi/intern/pluginapi.c
===================================================================
--- branches/soc-2007-mosani/source/blender/blenpluginapi/intern/pluginapi.c	2007-08-21 01:57:15 UTC (rev 11762)
+++ branches/soc-2007-mosani/source/blender/blenpluginapi/intern/pluginapi.c	2007-08-21 06:06:12 UTC (rev 11763)
@@ -826,11 +826,6 @@
 	if (!h) {
 		return;
 	}
-	
-	/* plugin-loading-error */
-	printf( "dynamic library opened: \n pointer - %p\n name - %s\n",
-		h,
-		filename );
 
 	stat(filename, &status);
 
@@ -838,10 +833,6 @@
 	current_lastchanged = status.st_mtime;
 
 	query_func = (void (*)()) PIL_dynlib_find_symbol(h, "plugin_query");
-	
-	/* plugin-loading-error */
-	printf( "plugin query function: \n pointer - %p\n",
-		query_func );
 
 	if (query_func) {
 		if (!plugin_store_all_apis(h)) {
@@ -1663,9 +1654,6 @@
 	char *s = NULL;
 	
 	dir = opendir(dirname);
-	
-	/* plugin-loading-error */
-	printf( "directory pointer: \n pointer - %p\n name - %s\n", dir, dirname );
 
 	if (dir != NULL) {
 		while ((de = readdir(dir)) != NULL) {
@@ -1751,26 +1739,14 @@
 
 static void plugin_parse_all_dirs()
 {
-	/* plugin-loading-error printfs */
-	printf( "U in plugin_parse_all_dirs: \n" );
-	printf( " U.plugtexdir = %s\n", U.plugtexdir );
-	printf( " U.plugseqdir = %s\n", U.plugseqdir );
-	printf( " U.plugrendir = %s\n", U.plugrendir );
-	printf( "Parsing U.plugtexdir: always does.\n" );
 	plugin_parsedir(U.plugtexdir, 0);
 	if (strcmp(U.plugtexdir, U.plugseqdir) != 0) {
-		printf( "Parsing U.plugseqdir: not parsed yet.\n" );
 		plugin_parsedir(U.plugseqdir, 0);
-	}else
-		printf( "Didn't parse U.plugseqdir: same as ..texdir\n" );
-	printf( "strcmp(U.plugtexdir, U.plugrendir): %d\n", strcmp(U.plugtexdir, U.plugrendir) );
-	printf( "strcmp(U.plugseqdir, U.plugrendir): %d\n", strcmp(U.plugtexdir, U.plugrendir) );
+	}
 	if(strcmp(U.plugtexdir, U.plugrendir) != 0 &&
 	   strcmp(U.plugseqdir, U.plugrendir) != 0 ) {
-	   	printf( "Parsing U.plugrendir: not parsed yet.\n" );
 		plugin_parsedir(U.plugrendir, 0);
-	}else
-		printf( "Didn't parse U.plugrendir: same as ..texdir or ..seqdir\n" );
+	}
 }
 
 static void plugin_scan_all(int force_refresh)

Modified: branches/soc-2007-mosani/source/blender/render/render_api/plugins/aqsis/aqsis_plugin.c
===================================================================
--- branches/soc-2007-mosani/source/blender/render/render_api/plugins/aqsis/aqsis_plugin.c	2007-08-21 01:57:15 UTC (rev 11762)
+++ branches/soc-2007-mosani/source/blender/render/render_api/plugins/aqsis/aqsis_plugin.c	2007-08-21 06:06:12 UTC (rev 11763)
@@ -4,7 +4,6 @@
 #include "PLU_api.h"
 #include "RenderAPI.h"
 #include "ri.h"
-#include "aqsis_plugin_helpers.h"
 
 PLU_IMPORT_API(register)
 RND_IMPORT_FULL_API

Modified: branches/soc-2007-mosani/source/blender/render/render_api/source/RND_internal.c
===================================================================
--- branches/soc-2007-mosani/source/blender/render/render_api/source/RND_internal.c	2007-08-21 01:57:15 UTC (rev 11762)
+++ branches/soc-2007-mosani/source/blender/render/render_api/source/RND_internal.c	2007-08-21 06:06:12 UTC (rev 11763)
@@ -62,18 +62,8 @@
 		strcpy( renderer_menu,
 			"Rendering Engine %t|Blender Internal %x0" );
 #endif
-
-		/* check if U is set */
-		printf( "U in RenderAPI_load_plugins: \n" );
-		printf( " U.plugtexdir = %s\n", U.plugtexdir );
-		printf( " U.plugseqdir = %s\n", U.plugseqdir );
-		printf( " U.plugrendir = %s\n", U.plugrendir );
 
-		renderers = plugin_enumerate( PLUGIN_TYPE_RENDER_OUTPUT, force_refresh );
-		/* plugin-loading-error */
-		printf( "plugin renderers: \n pointer - %p\n name - %s\n",
-			renderers,
-			renderers ? renderers->name : "bad pointer" );
+		renderers = plugin_enumerate( PLUGIN_TYPE_RENDER_OUTPUT, force_refresh );
 		for( ; renderers; renderers = renderers->next, renderer_index++ ){
 			sprintf( renderer_menu, "%s|%s %%x%d", 
 				renderer_menu, renderers->menu_entry, renderer_index );