[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14552] branches/soc-2008-jaguarandi: Merge trunk with branch
André Pinto
andresusanopinto at gmail.com
Fri Apr 25 20:29:12 CEST 2008
Revision: 14552
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14552
Author: jaguarandi
Date: 2008-04-25 20:28:59 +0200 (Fri, 25 Apr 2008)
Log Message:
-----------
Merge trunk with branch
svn merge -r 14529:14551 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-jaguarandi/CMakeLists.txt
branches/soc-2008-jaguarandi/release/datafiles/datatoc.c
branches/soc-2008-jaguarandi/release/scripts/DirectX8Exporter.py
branches/soc-2008-jaguarandi/release/scripts/ac3d_export.py
branches/soc-2008-jaguarandi/release/scripts/ac3d_import.py
branches/soc-2008-jaguarandi/release/scripts/bevel_center.py
branches/soc-2008-jaguarandi/release/scripts/collada_export.py
branches/soc-2008-jaguarandi/release/scripts/collada_import.py
branches/soc-2008-jaguarandi/release/scripts/config.py
branches/soc-2008-jaguarandi/release/scripts/console.py
branches/soc-2008-jaguarandi/release/scripts/envelope_symmetry.py
branches/soc-2008-jaguarandi/release/scripts/export_lightwave_motion.py
branches/soc-2008-jaguarandi/release/scripts/faceselect_same_weights.py
branches/soc-2008-jaguarandi/release/scripts/flt_export.py
branches/soc-2008-jaguarandi/release/scripts/flt_import.py
branches/soc-2008-jaguarandi/release/scripts/flt_palettemanager.py
branches/soc-2008-jaguarandi/release/scripts/flt_toolbar.py
branches/soc-2008-jaguarandi/release/scripts/help_browser.py
branches/soc-2008-jaguarandi/release/scripts/help_getting_started.py
branches/soc-2008-jaguarandi/release/scripts/help_manual.py
branches/soc-2008-jaguarandi/release/scripts/help_release_notes.py
branches/soc-2008-jaguarandi/release/scripts/help_tutorials.py
branches/soc-2008-jaguarandi/release/scripts/help_web_blender.py
branches/soc-2008-jaguarandi/release/scripts/help_web_devcomm.py
branches/soc-2008-jaguarandi/release/scripts/help_web_eshop.py
branches/soc-2008-jaguarandi/release/scripts/help_web_usercomm.py
branches/soc-2008-jaguarandi/release/scripts/image_edit.py
branches/soc-2008-jaguarandi/release/scripts/import_lightwave_motion.py
branches/soc-2008-jaguarandi/release/scripts/lightwave_export.py
branches/soc-2008-jaguarandi/release/scripts/md2_export.py
branches/soc-2008-jaguarandi/release/scripts/md2_import.py
branches/soc-2008-jaguarandi/release/scripts/mesh_boneweight_copy.py
branches/soc-2008-jaguarandi/release/scripts/mesh_cleanup.py
branches/soc-2008-jaguarandi/release/scripts/mesh_edges2curves.py
branches/soc-2008-jaguarandi/release/scripts/mesh_mirror_tool.py
branches/soc-2008-jaguarandi/release/scripts/mesh_poly_reduce.py
branches/soc-2008-jaguarandi/release/scripts/obdatacopier.py
branches/soc-2008-jaguarandi/release/scripts/object_apply_def.py
branches/soc-2008-jaguarandi/release/scripts/object_batch_name_edit.py
branches/soc-2008-jaguarandi/release/scripts/off_export.py
branches/soc-2008-jaguarandi/release/scripts/off_import.py
branches/soc-2008-jaguarandi/release/scripts/paths_import.py
branches/soc-2008-jaguarandi/release/scripts/raw_export.py
branches/soc-2008-jaguarandi/release/scripts/raw_import.py
branches/soc-2008-jaguarandi/release/scripts/renameobjectbyblock.py
branches/soc-2008-jaguarandi/release/scripts/render_save_layers.py
branches/soc-2008-jaguarandi/release/scripts/rvk1_torvk2.py
branches/soc-2008-jaguarandi/release/scripts/save_theme.py
branches/soc-2008-jaguarandi/release/scripts/scripttemplate_camer_object.py
branches/soc-2008-jaguarandi/release/scripts/scripttemplate_metaball_create.py
branches/soc-2008-jaguarandi/release/scripts/scripttemplate_object_edit.py
branches/soc-2008-jaguarandi/release/scripts/slp_import.py
branches/soc-2008-jaguarandi/release/scripts/sysinfo.py
branches/soc-2008-jaguarandi/release/scripts/unweld.py
branches/soc-2008-jaguarandi/release/scripts/uv_from_adjacent.py
branches/soc-2008-jaguarandi/release/scripts/uvcalc_follow_active_coords.py
branches/soc-2008-jaguarandi/release/scripts/uvcalc_lightmap.py
branches/soc-2008-jaguarandi/release/scripts/uvcalc_quad_clickproj.py
branches/soc-2008-jaguarandi/release/scripts/uvcalc_smart_project.py
branches/soc-2008-jaguarandi/release/scripts/uvcopy.py
branches/soc-2008-jaguarandi/release/scripts/vertexpaint_gradient.py
branches/soc-2008-jaguarandi/release/scripts/vertexpaint_selfshadow_ao.py
branches/soc-2008-jaguarandi/release/scripts/vrml97_export.py
branches/soc-2008-jaguarandi/release/scripts/weightpaint_clean.py
branches/soc-2008-jaguarandi/release/scripts/weightpaint_gradient.py
branches/soc-2008-jaguarandi/release/scripts/weightpaint_grow_shrink.py
branches/soc-2008-jaguarandi/release/scripts/weightpaint_normalize.py
branches/soc-2008-jaguarandi/release/scripts/widgetwizard.py
branches/soc-2008-jaguarandi/release/scripts/xfig_export.py
branches/soc-2008-jaguarandi/release/scripts/xsi_export.py
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/font.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/object.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/text.c
branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_bpath.h
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/bpath.c
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/util.c
branches/soc-2008-jaguarandi/source/blender/ftfont/intern/FTF_TTFont.cpp
branches/soc-2008-jaguarandi/source/blender/include/BSE_sequence.h
branches/soc-2008-jaguarandi/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/soc-2008-jaguarandi/source/blender/python/BPY_extern.h
branches/soc-2008-jaguarandi/source/blender/python/BPY_interface.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Blender.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Node.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/API_related.py
branches/soc-2008-jaguarandi/source/blender/src/buttons_object.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_scene.c
branches/soc-2008-jaguarandi/source/blender/src/header_script.c
branches/soc-2008-jaguarandi/source/blender/src/headerbuttons.c
branches/soc-2008-jaguarandi/source/blender/src/usiblender.c
branches/soc-2008-jaguarandi/source/creator/CMakeLists.txt
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-jaguarandi/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
Modified: branches/soc-2008-jaguarandi/CMakeLists.txt
===================================================================
--- branches/soc-2008-jaguarandi/CMakeLists.txt 2008-04-25 18:22:20 UTC (rev 14551)
+++ branches/soc-2008-jaguarandi/CMakeLists.txt 2008-04-25 18:28:59 UTC (rev 14552)
@@ -258,7 +258,7 @@
SET(FFMPEG ${LIBDIR}/ffmpeg)
SET(FFMPEG_INC ${FFMPEG}/include)
- SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49)
+ SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
@@ -299,7 +299,7 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib")
- SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib ")
+ SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
ENDIF(WIN32)
IF(APPLE)
Modified: branches/soc-2008-jaguarandi/release/datafiles/datatoc.c
===================================================================
--- branches/soc-2008-jaguarandi/release/datafiles/datatoc.c 2008-04-25 18:22:20 UTC (rev 14551)
+++ branches/soc-2008-jaguarandi/release/datafiles/datatoc.c 2008-04-25 18:28:59 UTC (rev 14552)
@@ -62,7 +62,7 @@
if (argv[1][i]=='.') argv[1][i]='_';
sprintf(sizest, "%d", (int)size);
- printf ("Input filesize is %d, Output size should be %d\n", size, ((int)size)*4 + strlen("/* DataToC output of file <> */\n\n") + strlen("char datatoc_[]= {\"") + strlen ("\"};\n") + (strlen(argv[1])*3) + strlen(sizest) + strlen("int datatoc__size= ;\n") +(((int)(size/256)+1)*5));
+ printf ("Input filesize is %ld, Output size should be %ld\n", size, ((int)size)*4 + strlen("/* DataToC output of file <> */\n\n") + strlen("char datatoc_[]= {\"") + strlen ("\"};\n") + (strlen(argv[1])*3) + strlen(sizest) + strlen("int datatoc__size= ;\n") +(((int)(size/256)+1)*5));
fpout= fopen(cname, "w");
if (!fpout) {
@@ -93,9 +93,9 @@
/* fprintf (fpout, "\\x%02x", getc(fpin)); */
fprintf (fpout, "%3d,", getc(fpin));
}
+ /* null terminate for the case it is a string */
+ fprintf (fpout, "\n 0};\n\n");
- fprintf (fpout, "\n};\n\n");
-
fclose(fpin);
fclose(fpout);
return 0;
Modified: branches/soc-2008-jaguarandi/release/scripts/DirectX8Exporter.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/DirectX8Exporter.py 2008-04-25 18:22:20 UTC (rev 14551)
+++ branches/soc-2008-jaguarandi/release/scripts/DirectX8Exporter.py 2008-04-25 18:28:59 UTC (rev 14552)
@@ -7,7 +7,7 @@
# Tooltip: 'Export to DirectX text file format format for XNA Animation Component Library.'
"""
__author__ = "minahito (original:Arben (Ben) Omari)"
-__url__ = ("blender", "elysiun", "Adjuster's site http://sunday-lab.blogspot.com/, Author's site http://www.omariben.too.it")
+__url__ = ("blender", "blenderartists.org", "Adjuster's site http://sunday-lab.blogspot.com/, Author's site http://www.omariben.too.it")
__version__ = "3.0"
__bpydoc__ = """\
Modified: branches/soc-2008-jaguarandi/release/scripts/ac3d_export.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/ac3d_export.py 2008-04-25 18:22:20 UTC (rev 14551)
+++ branches/soc-2008-jaguarandi/release/scripts/ac3d_export.py 2008-04-25 18:28:59 UTC (rev 14552)
@@ -8,7 +8,7 @@
"""
__author__ = "Willian P. Germano"
-__url__ = ("blender", "elysiun", "AC3D's homepage, http://www.ac3d.org",
+__url__ = ("blender", "blenderartists.org", "AC3D's homepage, http://www.ac3d.org",
"PLib 3d gaming lib, http://plib.sf.net")
__version__ = "2.44 2007-05-05"
Modified: branches/soc-2008-jaguarandi/release/scripts/ac3d_import.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/ac3d_import.py 2008-04-25 18:22:20 UTC (rev 14551)
+++ branches/soc-2008-jaguarandi/release/scripts/ac3d_import.py 2008-04-25 18:28:59 UTC (rev 14552)
@@ -8,7 +8,7 @@
"""
__author__ = "Willian P. Germano"
-__url__ = ("blender", "elysiun", "AC3D's homepage, http://www.ac3d.org",
+__url__ = ("blender", "blenderartists.org", "AC3D's homepage, http://www.ac3d.org",
"PLib 3d gaming lib, http://plib.sf.net")
__version__ = "2.43.1 2007-02-21"
Modified: branches/soc-2008-jaguarandi/release/scripts/bevel_center.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/bevel_center.py 2008-04-25 18:22:20 UTC (rev 14551)
+++ branches/soc-2008-jaguarandi/release/scripts/bevel_center.py 2008-04-25 18:28:59 UTC (rev 14552)
@@ -8,7 +8,7 @@
"""
__author__ = "Loic BERTHE"
-__url__ = ("blender", "elysiun")
+__url__ = ("blender", "blenderartists.org")
__version__ = "2.0"
__bpydoc__ = """\
Modified: branches/soc-2008-jaguarandi/release/scripts/collada_export.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/collada_export.py 2008-04-25 18:22:20 UTC (rev 14551)
+++ branches/soc-2008-jaguarandi/release/scripts/collada_export.py 2008-04-25 18:28:59 UTC (rev 14552)
@@ -8,7 +8,7 @@
"""
__author__ = "Mikael Lagre"
-__url__ = ("blender", "elysiun", "Project homepage, http://colladablender.sourceforge.net", "Official Collada site, http://www.collada.org")
+__url__ = ("blender", "blenderartists.org", "Project homepage, http://colladablender.sourceforge.net", "Official Collada site, http://www.collada.org")
__version__ = "0.4"
__bpydoc__ = """
Description:
Modified: branches/soc-2008-jaguarandi/release/scripts/collada_import.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/collada_import.py 2008-04-25 18:22:20 UTC (rev 14551)
+++ branches/soc-2008-jaguarandi/release/scripts/collada_import.py 2008-04-25 18:28:59 UTC (rev 14552)
@@ -8,7 +8,7 @@
"""
__author__ = "Mikael Lagre"
-__url__ = ("blender", "elysiun", "Project homepage, http://colladablender.sourceforge.net",)
+__url__ = ("blender", "blenderartist.org", "Project homepage, http://colladablender.sourceforge.net",)
__version__ = "0.4"
__bpydoc__ = """\Description: Imports a COLLADA 1.3.1 file into a Blender scene.
Usage: Run the script from the menu or inside Blender.
Modified: branches/soc-2008-jaguarandi/release/scripts/config.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/config.py 2008-04-25 18:22:20 UTC (rev 14551)
+++ branches/soc-2008-jaguarandi/release/scripts/config.py 2008-04-25 18:28:59 UTC (rev 14552)
@@ -10,7 +10,7 @@
__author__ = "Willian P. Germano"
__version__ = "0.1 2005/04/14"
__email__ = ('scripts', 'Author, wgermano:ig*com*br')
-__url__ = ('blender', 'elysiun')
+__url__ = ('blender', 'blenderartists.org')
__bpydoc__ ="""\
This script can be used to view and edit configuration data stored
Modified: branches/soc-2008-jaguarandi/release/scripts/console.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/console.py 2008-04-25 18:22:20 UTC (rev 14551)
+++ branches/soc-2008-jaguarandi/release/scripts/console.py 2008-04-25 18:28:59 UTC (rev 14552)
@@ -1,14 +1,14 @@
#!BPY
"""
-Name: 'Interactive Console'
-Blender: 237
+Name: 'Interactive Python Console'
+Blender: 245
Group: 'System'
Tooltip: 'Interactive Python Console'
"""
-__author__ = "Campbell Barton AKA Ideasman"
-__url__ = ["Author's homepage, http://members.iinet.net.au/~cpbarton/ideasman/", "blender", "elysiun", "Official Python site, http://www.python.org"]
+__author__ = "Campbell Barton aka ideasman42"
+__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
__bpydoc__ = """\
This is an interactive console, similar to Python's own command line interpreter. Since it is embedded in Blender, it has access to all Blender Python modules.
@@ -26,8 +26,6 @@
- Ctrl + Enter: auto compleate based on variable names and modules loaded -- multiple choices popup a menu;<br>
- Shift + Enter: multiline functions -- delays executing code until only Enter is pressed.
"""
-__author__ = "Campbell Barton AKA Ideasman"
-__url__ = ["http://members.iinet.net.au/~cpbarton/ideasman/", "blender", "elysiun"]
# --------------------------------------------------------------------------
# ***** BEGIN GPL LICENSE BLOCK *****
Modified: branches/soc-2008-jaguarandi/release/scripts/envelope_symmetry.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/envelope_symmetry.py 2008-04-25 18:22:20 UTC (rev 14551)
+++ branches/soc-2008-jaguarandi/release/scripts/envelope_symmetry.py 2008-04-25 18:28:59 UTC (rev 14552)
@@ -8,7 +8,7 @@
"""
__author__ = "Jonas Petersen"
-__url__ = ("blender", "elysiun", "Script's homepage, http://www.mindfloaters.de/blender/", "thread at blender.org, http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=4858 ")
+__url__ = ("blender", "blenderartists.org", "Script's homepage, http://www.mindfloaters.de/blender/", "thread at blender.org, http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=4858 ")
__version__ = "0.9 2004-11-10"
__doc__ = """\
This script creates perfectly symmetrical envelope sets. It is part of the
Modified: branches/soc-2008-jaguarandi/release/scripts/export_lightwave_motion.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/export_lightwave_motion.py 2008-04-25 18:22:20 UTC (rev 14551)
+++ branches/soc-2008-jaguarandi/release/scripts/export_lightwave_motion.py 2008-04-25 18:28:59 UTC (rev 14552)
@@ -8,7 +8,7 @@
"""
__author__ = "Daniel Salazar (ZanQdo)"
-__url__ = ("blender", "elysiun",
+__url__ = ("blender", "blenderartists.org",
"e-mail: zanqdo at gmail.com")
__version__ = "16/04/08"
Modified: branches/soc-2008-jaguarandi/release/scripts/faceselect_same_weights.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/faceselect_same_weights.py 2008-04-25 18:22:20 UTC (rev 14551)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list