kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- py api splash URL was old, use blender version (menu was ok in the menu)

Browse Source 
- netrender reloading fix
This commit is contained in:
Campbell Barton 2010-09-11 04:23:45 +00:00
parent 1fe90ba049
commit 63a8056839
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/io/netrender/__init__.py
View File

@ -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_file = ""
init_address = True
init_data = True
def register():
ui.addProperties()
@ -57,4 +58,3 @@ def register():
def unregister():
import bpy
del bpy.types.Scene.network_render

8
source/blender/windowmanager/intern/wm_operators.c
View File

@ -1147,6 +1147,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *arg_unuse
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 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *arg_unuse
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++) {