Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2012-04-07 22:39:29 +0400
committerThomas Dinges <blender@dingto.org>2012-04-07 22:39:29 +0400
commitfd37970b80945f27af58b8361014e617396b7814 (patch)
treedeec7fb372259a1fff29fa928aafd536fa35beaf
parentc60e7cd67b989a7ee92e78aa058355d47858f320 (diff)
* Replace some more Blender 2.5x with Blender 2.6x and some code cleanup.
-rw-r--r--release/scripts/modules/console_python.py3
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c2
-rw-r--r--source/creator/CMakeLists.txt4
-rw-r--r--source/creator/creator.c2
4 files changed, 4 insertions, 7 deletions
diff --git a/release/scripts/modules/console_python.py b/release/scripts/modules/console_python.py
index d4e45ece9fa..4ddde0de17c 100644
--- a/release/scripts/modules/console_python.py
+++ b/release/scripts/modules/console_python.py
@@ -306,9 +306,6 @@ def banner(context):
add_scrollback("Convenience Imports: from mathutils import *; "
"from math import *", 'OUTPUT')
add_scrollback("", 'OUTPUT')
- # add_scrollback(" WARNING!!! Blender 2.5 API is subject to change, "
- # "see API reference for more info", 'ERROR')
- # add_scrollback("", 'OUTPUT')
sc.prompt = PROMPT
return {'FINISHED'}
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index f5c594322d3..4bc510ef54b 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1303,7 +1303,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
uiItemStringO(col, IFACE_("Donations"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/blenderorg/blender-foundation/donation-payment");
uiItemStringO(col, IFACE_("Credits"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/development/credits");
uiItemStringO(col, IFACE_("Release Log"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/development/release-logs/blender-263");
- uiItemStringO(col, IFACE_("Manual"), ICON_URL, "WM_OT_url_open", "url", "http://wiki.blender.org/index.php/Doc:2.5/Manual");
+ uiItemStringO(col, IFACE_("Manual"), ICON_URL, "WM_OT_url_open", "url", "http://wiki.blender.org/index.php/Doc:2.6/Manual");
uiItemStringO(col, IFACE_("Blender Website"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org");
uiItemStringO(col, IFACE_("User Community"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/community/user-community");
if (strcmp(STRINGIFY(BLENDER_VERSION_CYCLE), "release") == 0) {
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 0873fd9a61f..83804ab1a7f 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -396,7 +396,7 @@ if(UNIX AND NOT APPLE)
)
endif()
- # plugins in blender 2.5 don't work at the moment.
+ # plugins in blender 2.6 don't work at the moment.
#
# install(
# DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
@@ -462,7 +462,7 @@ elseif(WIN32)
endif()
endif()
- # plugins in blender 2.5 don't work at the moment.
+ # plugins in blender 2.6 don't work at the moment.
#
# install(
# DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 353fb6425c7..516c50a01f9 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -447,7 +447,7 @@ static int playback_mode(int UNUSED(argc), const char **UNUSED(argv), void *UNUS
#if 0 /* TODO, bring player back? */
playanim(argc, argv); /* not the same argc and argv as before */
#else
- fprintf(stderr, "Playback mode not supported in blender 2.5x\n");
+ fprintf(stderr, "Playback mode not supported in blender 2.6x\n");
exit(0);
#endif
}