[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31869] trunk/blender: - py api splash URL was old, use blender version (menu was ok in the menu)

[Campbell Barton]

Revision: 31869
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31869
Author:   campbellbarton
Date:     2010-09-11 06:23:45 +0200 (Sat, 11 Sep 2010)

Log Message:
-----------
- py api splash URL was old, use blender version (menu was ok in the menu)
- netrender reloading fix

Modified Paths:
--------------
    trunk/blender/release/scripts/io/netrender/__init__.py
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/release/scripts/io/netrender/__init__.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/__init__.py	2010-09-11 00:19:38 UTC (rev 31868)
+++ trunk/blender/release/scripts/io/netrender/__init__.py	2010-09-11 04:23:45 UTC (rev 31869)
@@ -19,7 +19,7 @@
 # This directory is a Python package.
 
 # To support reload properly, try to access a package var, if it's there, reload everything
-if "bpy" in locals():
+if "init_data" in locals():
     reload(model)
     reload(operators)
     reload(client)
@@ -50,6 +50,7 @@
 init_address = True
 init_data = True
 
+
 def register():
     ui.addProperties()
     
@@ -57,4 +58,3 @@
 def unregister():
     import bpy
     del bpy.types.Scene.network_render
-

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-09-11 00:19:38 UTC (rev 31868)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-09-11 04:23:45 UTC (rev 31869)
@@ -1147,6 +1147,7 @@
 	int i;
 	Menu menu= {0};
 	MenuType *mt= WM_menutype_find("USERPREF_MT_splash", TRUE);
+	char url[64];
 	
 #ifdef NAN_BUILDINFO
 	int ver_width, rev_width;
@@ -1199,10 +1200,11 @@
 	uiItemStringO(col, "Release Log", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/development/release-logs/blender-250/");
 	uiItemStringO(col, "Manual", ICON_URL, "WM_OT_url_open", "url", "http://wiki.blender.org/index.php/Doc:Manual");
 	uiItemStringO(col, "Blender Website", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/");
-	uiItemStringO(col, "User Community", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/community/user-community/");
-	uiItemStringO(col, "Python API Reference", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/documentation/250PythonDoc/contents.html");
+	uiItemStringO(col, "User Community", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/community/user-community/"); // 
+	BLI_snprintf(url, sizeof(url), "http://www.blender.org/documentation/blender_python_api_%d_%d_%d", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION);
+	uiItemStringO(col, "Python API Reference", ICON_URL, "WM_OT_url_open", "url", url);
 	uiItemL(col, "", 0);
-	
+
 	col = uiLayoutColumn(split, 0);
 	uiItemL(col, "Recent", 0);
 	for(recent = G.recent_files.first, i=0; (i<5) && (recent); recent = recent->next, i++) {