Revision: 15458
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15458
Author: mxcurioni
Date: 2008-07-06 21:53:32 +0200 (Sun, 06 Jul 2008)
Log Message:
-----------
soc-2008-mxcurioni: merge-repair with trunk rev 15456
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15456
Modified Paths:
--------------
branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
branches/soc-2008-mxcurioni/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
branches/soc-2008-mxcurioni/release/scripts/DirectX8Exporter.py
branches/soc-2008-mxcurioni/release/scripts/ac3d_export.py
branches/soc-2008-mxcurioni/release/scripts/ac3d_import.py
branches/soc-2008-mxcurioni/release/scripts/bevel_center.py
branches/soc-2008-mxcurioni/release/scripts/collada_export.py
branches/soc-2008-mxcurioni/release/scripts/collada_import.py
branches/soc-2008-mxcurioni/release/scripts/config.py
branches/soc-2008-mxcurioni/release/scripts/console.py
branches/soc-2008-mxcurioni/release/scripts/envelope_symmetry.py
branches/soc-2008-mxcurioni/release/scripts/export_lightwave_motion.py
branches/soc-2008-mxcurioni/release/scripts/faceselect_same_weights.py
branches/soc-2008-mxcurioni/release/scripts/flt_export.py
branches/soc-2008-mxcurioni/release/scripts/flt_import.py
branches/soc-2008-mxcurioni/release/scripts/flt_palettemanager.py
branches/soc-2008-mxcurioni/release/scripts/flt_toolbar.py
branches/soc-2008-mxcurioni/release/scripts/help_browser.py
branches/soc-2008-mxcurioni/release/scripts/help_getting_started.py
branches/soc-2008-mxcurioni/release/scripts/help_manual.py
branches/soc-2008-mxcurioni/release/scripts/help_release_notes.py
branches/soc-2008-mxcurioni/release/scripts/help_tutorials.py
branches/soc-2008-mxcurioni/release/scripts/help_web_blender.py
branches/soc-2008-mxcurioni/release/scripts/help_web_devcomm.py
branches/soc-2008-mxcurioni/release/scripts/help_web_eshop.py
branches/soc-2008-mxcurioni/release/scripts/help_web_usercomm.py
branches/soc-2008-mxcurioni/release/scripts/image_edit.py
branches/soc-2008-mxcurioni/release/scripts/import_lightwave_motion.py
branches/soc-2008-mxcurioni/release/scripts/lightwave_export.py
branches/soc-2008-mxcurioni/release/scripts/md2_export.py
branches/soc-2008-mxcurioni/release/scripts/md2_import.py
branches/soc-2008-mxcurioni/release/scripts/mesh_boneweight_copy.py
branches/soc-2008-mxcurioni/release/scripts/mesh_cleanup.py
branches/soc-2008-mxcurioni/release/scripts/mesh_edges2curves.py
branches/soc-2008-mxcurioni/release/scripts/mesh_mirror_tool.py
branches/soc-2008-mxcurioni/release/scripts/mesh_poly_reduce.py
branches/soc-2008-mxcurioni/release/scripts/obdatacopier.py
branches/soc-2008-mxcurioni/release/scripts/object_apply_def.py
branches/soc-2008-mxcurioni/release/scripts/object_batch_name_edit.py
branches/soc-2008-mxcurioni/release/scripts/off_export.py
branches/soc-2008-mxcurioni/release/scripts/off_import.py
branches/soc-2008-mxcurioni/release/scripts/paths_import.py
branches/soc-2008-mxcurioni/release/scripts/raw_export.py
branches/soc-2008-mxcurioni/release/scripts/raw_import.py
branches/soc-2008-mxcurioni/release/scripts/renameobjectbyblock.py
branches/soc-2008-mxcurioni/release/scripts/render_save_layers.py
branches/soc-2008-mxcurioni/release/scripts/rvk1_torvk2.py
branches/soc-2008-mxcurioni/release/scripts/save_theme.py
branches/soc-2008-mxcurioni/release/scripts/scripttemplate_camer_object.py
branches/soc-2008-mxcurioni/release/scripts/scripttemplate_metaball_create.py
branches/soc-2008-mxcurioni/release/scripts/scripttemplate_object_edit.py
branches/soc-2008-mxcurioni/release/scripts/slp_import.py
branches/soc-2008-mxcurioni/release/scripts/sysinfo.py
branches/soc-2008-mxcurioni/release/scripts/unweld.py
branches/soc-2008-mxcurioni/release/scripts/uvcalc_follow_active_coords.py
branches/soc-2008-mxcurioni/release/scripts/uvcalc_lightmap.py
branches/soc-2008-mxcurioni/release/scripts/uvcalc_quad_clickproj.py
branches/soc-2008-mxcurioni/release/scripts/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/uvcopy.py
branches/soc-2008-mxcurioni/release/scripts/vertexpaint_gradient.py
branches/soc-2008-mxcurioni/release/scripts/vertexpaint_selfshadow_ao.py
branches/soc-2008-mxcurioni/release/scripts/vrml97_export.py
branches/soc-2008-mxcurioni/release/scripts/weightpaint_clean.py
branches/soc-2008-mxcurioni/release/scripts/weightpaint_gradient.py
branches/soc-2008-mxcurioni/release/scripts/weightpaint_grow_shrink.py
branches/soc-2008-mxcurioni/release/scripts/weightpaint_normalize.py
branches/soc-2008-mxcurioni/release/scripts/widgetwizard.py
branches/soc-2008-mxcurioni/release/scripts/xfig_export.py
branches/soc-2008-mxcurioni/release/scripts/xsi_export.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_arithb.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/arithb.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/psfont.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/winstuff.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenpluginapi/intern/pluginapi.c
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/api.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/SConscript
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/readimage.c
branches/soc-2008-mxcurioni/source/blender/include/BIF_drawseq.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/SConscript
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/python/BPY_extern.h
branches/soc-2008-mxcurioni/source/blender/python/BPY_interface.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Node.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/API_related.py
branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_editing.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_logic.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_object.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_shading.c
branches/soc-2008-mxcurioni/source/blender/src/drawimage.c
branches/soc-2008-mxcurioni/source/blender/src/drawimasel.c
branches/soc-2008-mxcurioni/source/blender/src/drawipo.c
branches/soc-2008-mxcurioni/source/blender/src/drawobject.c
branches/soc-2008-mxcurioni/source/blender/src/drawseq.c
branches/soc-2008-mxcurioni/source/blender/src/editcurve.c
branches/soc-2008-mxcurioni/source/blender/src/editmesh_lib.c
branches/soc-2008-mxcurioni/source/blender/src/editobject.c
branches/soc-2008-mxcurioni/source/blender/src/editseq.c
branches/soc-2008-mxcurioni/source/blender/src/filesel.c
branches/soc-2008-mxcurioni/source/blender/src/header_image.c
branches/soc-2008-mxcurioni/source/blender/src/header_script.c
branches/soc-2008-mxcurioni/source/blender/src/header_seq.c
branches/soc-2008-mxcurioni/source/blender/src/headerbuttons.c
branches/soc-2008-mxcurioni/source/blender/src/parametrizer.c
branches/soc-2008-mxcurioni/source/blender/src/parametrizer.h
branches/soc-2008-mxcurioni/source/blender/src/parametrizer_intern.h
branches/soc-2008-mxcurioni/source/blender/src/renderwin.c
branches/soc-2008-mxcurioni/source/blender/src/sequence.c
branches/soc-2008-mxcurioni/source/blender/src/space.c
branches/soc-2008-mxcurioni/source/blender/src/splash.jpg.c
branches/soc-2008-mxcurioni/source/blender/src/transform_orientations.c
branches/soc-2008-mxcurioni/source/blender/src/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/src/unwrapper.c
branches/soc-2008-mxcurioni/source/blender/src/usiblender.c
branches/soc-2008-mxcurioni/source/blender/yafray/SConscript
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/SConscript
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_GameObject.py
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/SConscript
Modified: branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
2008-07-06 18:19:42 UTC (rev 15457)
+++ branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
2008-07-06 19:53:32 UTC (rev 15458)
@@ -38,7 +38,10 @@
#include <stdarg.h>
/* mmap exception */
-#if defined(AMIGA) || defined(__BeOS) || defined(WIN32)
+#if defined(AMIGA) || defined(__BeOS)
+#elif defined(WIN32)
+#include <sys/types.h>
+#include "mmap_win.h"
#else
#include <sys/types.h>
#include <sys/mman.h>
@@ -289,7 +292,7 @@
/* note; mmap returns zero'd memory */
void *MEM_mapallocN(unsigned int len, const char *str)
{
-#if defined(AMIGA) || defined(__BeOS) || defined(WIN32)
+#if defined(AMIGA) || defined(__BeOS)
return MEM_callocN(len, str);
#else
MemHead *memh;
@@ -586,7 +589,7 @@
totblock--;
mem_in_use -= memh->len;
-#if defined(AMIGA) || defined(__BeOS) || defined(WIN32)
+#if defined(AMIGA) || defined(__BeOS)
free(memh);
#else
Modified:
branches/soc-2008-mxcurioni/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
===================================================================
---
branches/soc-2008-mxcurioni/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
2008-07-06 18:19:42 UTC (rev 15457)
+++
branches/soc-2008-mxcurioni/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
2008-07-06 19:53:32 UTC (rev 15458)
@@ -251,6 +251,9 @@
<File
RelativePath="..\..\intern\mallocn.c">
</File>
+ <File
+ RelativePath="..\..\intern\mmap_win.c">
+ </File>
</Filter>
<Filter
Name="Header Files"
@@ -261,7 +264,14 @@
<File
RelativePath="..\..\MEM_guardedalloc.h">
</File>
+ <File
+ RelativePath="..\..\mmap_win.h">
+ </File>
</Filter>
+ <Filter
+ Name="intern"
+ Filter="">
+ </Filter>
</Filter>
</Files>
<Globals>
Modified: branches/soc-2008-mxcurioni/release/scripts/DirectX8Exporter.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/DirectX8Exporter.py
2008-07-06 18:19:42 UTC (rev 15457)
+++ branches/soc-2008-mxcurioni/release/scripts/DirectX8Exporter.py
2008-07-06 19:53:32 UTC (rev 15458)
@@ -6,9 +6,9 @@
# Group: 'Export'
# 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";)
-__version__ = "3.0"
+__author__ = "vertex color exporting feature is added by mnemoto
(original:minahito (original:Arben (Ben) Omari))"
+__url__ = ("blender", "elysiun", "Adjuster's site
http://sunday-lab.blogspot.com/, Author's site
http://www.omariben.too.it","Adjuster's site http://ex.homeunix.net/";)
+__version__ = "3.1"
__bpydoc__ = """\
This script exports a Blender mesh with armature to DirectX 8's text file
@@ -444,6 +444,7 @@
self.writeMeshMaterialList(obj, mesh, tex)
self.writeMeshNormals(obj, mesh)
self.writeMeshTextureCoords(obj, mesh)
+ self.writeMeshVertexColors(obj, mesh)
self.file.write(" } // End of the Mesh %s \n" % (obj.name))
@@ -464,6 +465,7 @@
self.writeMeshMaterialList(obj, mesh, tex)
self.writeMeshNormals(obj, mesh)
self.writeMeshTextureCoords(obj, mesh)
+ self.writeMeshVertexColors(obj, mesh)
self.file.write(" }\n")
self.file.write("}\n")
ind = objs.index(obj)
@@ -1047,6 +1049,32 @@
self.file.write(",\n")
self.file.write("} //End of MeshTextureCoords\n")
+
+ #***********************************************
+ #MESH VORTEX COLORS
+ #***********************************************
+ def writeMeshVertexColors(self, name, mesh):
+ if mesh.hasVertexColours():
+ self.file.write("MeshVertexColors {\n")
+ #VERTICES NUMBER
+ numvert = reduce( lambda i,f: len(f)+i, mesh.faces, 0)
+ self.file.write("%d;\n" % (numvert))
+ #VERTEX COLORS
+
+ vcounter =0
+ for f in mesh.faces:
+ col = f.col
+ for i,c in enumerate(col):
+ # Note vcol alpha has no meaning
+ self.file.write("%d;%f;%f;%f;%f;" %
(vcounter,c.r/255.0, c.g/255.0, c.b/255.0, 1.0)) # c.a/255.0))
+ vcounter+=1
+ if vcounter == numvert :
+ self.file.write(";\n")
+ else :
+ self.file.write(",\n")
+
+ self.file.write("} //End of MeshVertexColors\n")
+
#***********************************************#***********************************************#***********************************************
#***********************************************
#FRAMES
Modified: branches/soc-2008-mxcurioni/release/scripts/ac3d_export.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ac3d_export.py 2008-07-06
18:19:42 UTC (rev 15457)
+++ branches/soc-2008-mxcurioni/release/scripts/ac3d_export.py 2008-07-06
19:53:32 UTC (rev 15458)
@@ -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-mxcurioni/release/scripts/ac3d_import.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ac3d_import.py 2008-07-06
18:19:42 UTC (rev 15457)
+++ branches/soc-2008-mxcurioni/release/scripts/ac3d_import.py 2008-07-06
19:53:32 UTC (rev 15458)
@@ -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-mxcurioni/release/scripts/bevel_center.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/bevel_center.py 2008-07-06
18:19:42 UTC (rev 15457)
+++ branches/soc-2008-mxcurioni/release/scripts/bevel_center.py 2008-07-06
19:53:32 UTC (rev 15458)
@@ -8,7 +8,7 @@
"""
__author__ = "Loic BERTHE"
-__url__ = ("blender", "elysiun")
+__url__ = ("blender", "blenderartists.org")
__version__ = "2.0"
__bpydoc__ = """\
Modified: branches/soc-2008-mxcurioni/release/scripts/collada_export.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/collada_export.py
2008-07-06 18:19:42 UTC (rev 15457)
+++ branches/soc-2008-mxcurioni/release/scripts/collada_export.py
2008-07-06 19:53:32 UTC (rev 15458)
@@ -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-mxcurioni/release/scripts/collada_import.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/collada_import.py
2008-07-06 18:19:42 UTC (rev 15457)
+++ branches/soc-2008-mxcurioni/release/scripts/collada_import.py
2008-07-06 19:53:32 UTC (rev 15458)
@@ -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-mxcurioni/release/scripts/config.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/config.py 2008-07-06
18:19:42 UTC (rev 15457)
+++ branches/soc-2008-mxcurioni/release/scripts/config.py 2008-07-06
19:53:32 UTC (rev 15458)
@@ -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-mxcurioni/release/scripts/console.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/console.py 2008-07-06
18:19:42 UTC (rev 15457)
+++ branches/soc-2008-mxcurioni/release/scripts/console.py 2008-07-06
19:53:32 UTC (rev 15458)
@@ -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-mxcurioni/release/scripts/envelope_symmetry.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/envelope_symmetry.py
2008-07-06 18:19:42 UTC (rev 15457)
+++ branches/soc-2008-mxcurioni/release/scripts/envelope_symmetry.py
2008-07-06 19:53:32 UTC (rev 15458)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
