[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22939] branches/itasc: svn merge -r 22840 :22933 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/ blender
Benoit Bolsee
benoit.bolsee at online.be
Wed Sep 2 00:41:15 CEST 2009
Revision: 22939
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22939
Author: ben2610
Date: 2009-09-02 00:41:15 +0200 (Wed, 02 Sep 2009)
Log Message:
-----------
svn merge -r 22840:22933 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/itasc/CMakeLists.txt
branches/itasc/config/win32-mingw-config.py
branches/itasc/extern/xvidcore/build/generic/configure
branches/itasc/extern/xvidcore/build/generic/configure.in
branches/itasc/release/datafiles/datatoc.py
branches/itasc/release/io/engine_render_pov.py
branches/itasc/release/io/export_ply.py
branches/itasc/release/ui/buttons_data_armature.py
branches/itasc/release/ui/buttons_data_bone.py
branches/itasc/release/ui/buttons_data_camera.py
branches/itasc/release/ui/buttons_data_curve.py
branches/itasc/release/ui/buttons_data_lamp.py
branches/itasc/release/ui/buttons_data_lattice.py
branches/itasc/release/ui/buttons_data_mesh.py
branches/itasc/release/ui/buttons_data_modifier.py
branches/itasc/release/ui/buttons_data_text.py
branches/itasc/release/ui/buttons_game.py
branches/itasc/release/ui/buttons_material.py
branches/itasc/release/ui/buttons_particle.py
branches/itasc/release/ui/buttons_physics_cloth.py
branches/itasc/release/ui/buttons_physics_field.py
branches/itasc/release/ui/buttons_physics_fluid.py
branches/itasc/release/ui/buttons_physics_smoke.py
branches/itasc/release/ui/buttons_physics_softbody.py
branches/itasc/release/ui/buttons_scene.py
branches/itasc/release/ui/buttons_texture.py
branches/itasc/release/ui/buttons_world.py
branches/itasc/release/ui/space_image.py
branches/itasc/release/ui/space_info.py
branches/itasc/release/ui/space_node.py
branches/itasc/release/ui/space_sequencer.py
branches/itasc/release/ui/space_text.py
branches/itasc/release/ui/space_time.py
branches/itasc/release/ui/space_userpref.py
branches/itasc/release/ui/space_view3d.py
branches/itasc/release/ui/space_view3d_toolbar.py
branches/itasc/source/Makefile
branches/itasc/source/blender/blenkernel/BKE_paint.h
branches/itasc/source/blender/blenkernel/BKE_particle.h
branches/itasc/source/blender/blenkernel/BKE_pointcache.h
branches/itasc/source/blender/blenkernel/BKE_shrinkwrap.h
branches/itasc/source/blender/blenkernel/intern/DerivedMesh.c
branches/itasc/source/blender/blenkernel/intern/armature.c
branches/itasc/source/blender/blenkernel/intern/cloth.c
branches/itasc/source/blender/blenkernel/intern/gpencil.c
branches/itasc/source/blender/blenkernel/intern/object.c
branches/itasc/source/blender/blenkernel/intern/particle.c
branches/itasc/source/blender/blenkernel/intern/particle_system.c
branches/itasc/source/blender/blenkernel/intern/pointcache.c
branches/itasc/source/blender/blenkernel/intern/scene.c
branches/itasc/source/blender/blenkernel/intern/shrinkwrap.c
branches/itasc/source/blender/blenkernel/intern/sound.c
branches/itasc/source/blender/blenlib/BLI_arithb.h
branches/itasc/source/blender/blenlib/intern/arithb.c
branches/itasc/source/blender/blenloader/intern/readfile.c
branches/itasc/source/blender/blenloader/intern/writefile.c
branches/itasc/source/blender/editors/Makefile
branches/itasc/source/blender/editors/gpencil/drawgpencil.c
branches/itasc/source/blender/editors/gpencil/gpencil_buttons.c
branches/itasc/source/blender/editors/gpencil/gpencil_edit.c
branches/itasc/source/blender/editors/gpencil/gpencil_intern.h
branches/itasc/source/blender/editors/gpencil/gpencil_ops.c
branches/itasc/source/blender/editors/gpencil/gpencil_paint.c
branches/itasc/source/blender/editors/include/ED_gpencil.h
branches/itasc/source/blender/editors/include/ED_particle.h
branches/itasc/source/blender/editors/include/ED_screen.h
branches/itasc/source/blender/editors/include/ED_sound.h
branches/itasc/source/blender/editors/interface/interface_handlers.c
branches/itasc/source/blender/editors/mesh/editmesh.c
branches/itasc/source/blender/editors/object/object_edit.c
branches/itasc/source/blender/editors/physics/ed_pointcache.c
branches/itasc/source/blender/editors/physics/editparticle.c
branches/itasc/source/blender/editors/screen/area.c
branches/itasc/source/blender/editors/sculpt_paint/paint_vertex.c
branches/itasc/source/blender/editors/sculpt_paint/sculpt.c
branches/itasc/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/itasc/source/blender/editors/sound/sound_intern.h
branches/itasc/source/blender/editors/sound/sound_ops.c
branches/itasc/source/blender/editors/space_api/spacetypes.c
branches/itasc/source/blender/editors/space_file/file_panels.c
branches/itasc/source/blender/editors/space_image/image_buttons.c
branches/itasc/source/blender/editors/space_image/image_draw.c
branches/itasc/source/blender/editors/space_image/image_intern.h
branches/itasc/source/blender/editors/space_image/image_ops.c
branches/itasc/source/blender/editors/space_image/space_image.c
branches/itasc/source/blender/editors/space_logic/logic_window.c
branches/itasc/source/blender/editors/space_outliner/outliner.c
branches/itasc/source/blender/editors/space_view3d/drawobject.c
branches/itasc/source/blender/editors/space_view3d/space_view3d.c
branches/itasc/source/blender/editors/space_view3d/view3d_buttons.c
branches/itasc/source/blender/editors/space_view3d/view3d_header.c
branches/itasc/source/blender/editors/space_view3d/view3d_ops.c
branches/itasc/source/blender/editors/space_view3d/view3d_view.c
branches/itasc/source/blender/editors/transform/transform.c
branches/itasc/source/blender/editors/transform/transform_conversions.c
branches/itasc/source/blender/editors/transform/transform_generics.c
branches/itasc/source/blender/editors/transform/transform_manipulator.c
branches/itasc/source/blender/makesdna/DNA_action_types.h
branches/itasc/source/blender/makesdna/DNA_object_force.h
branches/itasc/source/blender/makesdna/DNA_particle_types.h
branches/itasc/source/blender/makesdna/DNA_scene_types.h
branches/itasc/source/blender/makesdna/DNA_userdef_types.h
branches/itasc/source/blender/makesrna/RNA_enum_types.h
branches/itasc/source/blender/makesrna/RNA_types.h
branches/itasc/source/blender/makesrna/intern/CMakeLists.txt
branches/itasc/source/blender/makesrna/intern/Makefile
branches/itasc/source/blender/makesrna/intern/SConscript
branches/itasc/source/blender/makesrna/intern/rna_curve.c
branches/itasc/source/blender/makesrna/intern/rna_fluidsim.c
branches/itasc/source/blender/makesrna/intern/rna_gpencil.c
branches/itasc/source/blender/makesrna/intern/rna_material.c
branches/itasc/source/blender/makesrna/intern/rna_mesh.c
branches/itasc/source/blender/makesrna/intern/rna_object.c
branches/itasc/source/blender/makesrna/intern/rna_packedfile.c
branches/itasc/source/blender/makesrna/intern/rna_particle.c
branches/itasc/source/blender/makesrna/intern/rna_pose.c
branches/itasc/source/blender/makesrna/intern/rna_scene.c
branches/itasc/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/itasc/source/blender/makesrna/intern/rna_space.c
branches/itasc/source/blender/makesrna/intern/rna_texture.c
branches/itasc/source/blender/makesrna/intern/rna_userdef.c
branches/itasc/source/blender/makesrna/intern/rna_world.c
branches/itasc/source/blender/python/intern/bpy_interface.c
branches/itasc/source/blender/render/intern/include/render_types.h
branches/itasc/source/blender/render/intern/source/convertblender.c
branches/itasc/source/blender/render/intern/source/rayshade.c
branches/itasc/source/blender/render/intern/source/rendercore.c
branches/itasc/source/blender/render/intern/source/volumetric.c
branches/itasc/source/blender/windowmanager/intern/wm_files.c
branches/itasc/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/itasc/source/gameengine/Ketsji/KX_GameObject.cpp
branches/itasc/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/itasc/source/gameengine/PyDoc/GameLogic.py
Added Paths:
-----------
branches/itasc/release/io/netrender/
branches/itasc/release/io/netrender/__init__.py
branches/itasc/release/io/netrender/client.py
branches/itasc/release/io/netrender/master.py
branches/itasc/release/io/netrender/model.py
branches/itasc/release/io/netrender/operators.py
branches/itasc/release/io/netrender/slave.py
branches/itasc/release/io/netrender/ui.py
branches/itasc/release/io/netrender/utils.py
branches/itasc/release/scripts/import_edl.py
branches/itasc/source/blender/editors/sound/Makefile
Removed Paths:
-------------
branches/itasc/release/datafiles/datatoc.c
branches/itasc/release/io/netrender/__init__.py
branches/itasc/release/io/netrender/client.py
branches/itasc/release/io/netrender/master.py
branches/itasc/release/io/netrender/model.py
branches/itasc/release/io/netrender/operators.py
branches/itasc/release/io/netrender/slave.py
branches/itasc/release/io/netrender/ui.py
branches/itasc/release/io/netrender/utils.py
branches/itasc/source/blender/blenkernel/BKE_sculpt.h
Property Changed:
----------------
branches/itasc/release/datafiles/datatoc.py
branches/itasc/source/blender/editors/gpencil/gpencil_buttons.c
branches/itasc/source/blender/editors/include/ED_sound.h
branches/itasc/source/blender/editors/sound/sound_intern.h
branches/itasc/source/blender/editors/sound/sound_ops.c
Modified: branches/itasc/CMakeLists.txt
===================================================================
--- branches/itasc/CMakeLists.txt 2009-09-01 21:07:19 UTC (rev 22938)
+++ branches/itasc/CMakeLists.txt 2009-09-01 22:41:15 UTC (rev 22939)
@@ -259,7 +259,7 @@
IF(WITH_SNDFILE)
SET(SNDFILE ${LIBDIR}/sndfile)
SET(SNDFILE_INC ${SNDFILE}/include)
- SET(SNDFILE_LIB sndfile)
+ SET(SNDFILE_LIB libsndfile-1)
SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
ENDIF(WITH_SNDFILE)
@@ -329,7 +329,7 @@
SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
SET(FFMPEG ${LIBDIR}/ffmpeg)
- SET(FFMPEG_INC ${FFMPEG}/include)
+ SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
@@ -377,7 +377,7 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
IF(CMAKE_CL_64)
- SET(PLATFORM_LINKFLAGS "/MANIFEST:NO /MANIFESTUAC:NO /MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+ SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
ELSE(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
ENDIF(CMAKE_CL_64)
Modified: branches/itasc/config/win32-mingw-config.py
===================================================================
--- branches/itasc/config/win32-mingw-config.py 2009-09-01 21:07:19 UTC (rev 22938)
+++ branches/itasc/config/win32-mingw-config.py 2009-09-01 22:41:15 UTC (rev 22939)
@@ -35,7 +35,7 @@
WITH_BF_SNDFILE = False
BF_SNDFILE = LIBDIR + '/sndfile'
BF_SNDFILE_INC = '${BF_SNDFILE}/include'
-BF_SNDFILE_LIB = 'libsndfile'
+BF_SNDFILE_LIB = 'libsndfile-1'
BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
WITH_BF_SDL = True
Modified: branches/itasc/extern/xvidcore/build/generic/configure
===================================================================
--- branches/itasc/extern/xvidcore/build/generic/configure 2009-09-01 21:07:19 UTC (rev 22938)
+++ branches/itasc/extern/xvidcore/build/generic/configure 2009-09-01 22:41:15 UTC (rev 22939)
@@ -4112,7 +4112,7 @@
AS="$chosen_asm_prog"
ASSEMBLY_EXTENSION="asm"
- AFLAGS="-I\$(<D)/ -I../../src/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
+ AFLAGS="-I\$(<D)/ -Iextern/xvidcore/src/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
ASSEMBLY_SOURCES="SRC_${ARCHITECTURE}"
if test "$ARCHITECTURE" = "X86_64" ; then
AFLAGS=${AFLAGS}" -DARCH_IS_X86_64"
Modified: branches/itasc/extern/xvidcore/build/generic/configure.in
===================================================================
--- branches/itasc/extern/xvidcore/build/generic/configure.in 2009-09-01 21:07:19 UTC (rev 22938)
+++ branches/itasc/extern/xvidcore/build/generic/configure.in 2009-09-01 22:41:15 UTC (rev 22939)
@@ -436,7 +436,7 @@
AS="$chosen_asm_prog"
ASSEMBLY_EXTENSION="asm"
- AFLAGS="-I\$(<D)/ -I../../src/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
+ AFLAGS="-I\$(<D)/ -Iextern/xvidcore/src/ -f $NASM_FORMAT $PREFIX $MARK_FUNCS"
ASSEMBLY_SOURCES="SRC_${ARCHITECTURE}"
if test "$ARCHITECTURE" = "X86_64" ; then
AFLAGS=${AFLAGS}" -DARCH_IS_X86_64"
Deleted: branches/itasc/release/datafiles/datatoc.c
===================================================================
--- branches/itasc/release/datafiles/datatoc.c 2009-09-01 21:07:19 UTC (rev 22938)
+++ branches/itasc/release/datafiles/datatoc.c 2009-09-01 22:41:15 UTC (rev 22939)
@@ -1,102 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-int main(int argc, char**argv) {
- FILE *fpin, *fpout;
- char cname[256];
- char sizest[256];
- size_t size;
- int i;
-
- if (argc<1) {
- printf ("Usage: datatoc <data_file>\n");
- exit(1);
- }
-
- fpin= fopen(argv[1], "rb");
- if (!fpin) {
- printf ("Unable to open input <%s>\n", argv[1]);
- exit(1);
- }
-
- fseek (fpin, 0L, SEEK_END);
- size= ftell(fpin);
- fseek (fpin, 0L, SEEK_SET);
-
- if (argv[1][0]=='.') argv[1]++;
-
- sprintf(cname, "%s.c", argv[1]);
- printf ("Making C file <%s>\n", cname);
-
- for (i=0; i < (int)strlen(argv[1]); i++)
- if (argv[1][i]=='.') argv[1][i]='_';
-
- sprintf(sizest, "%d", (int)size);
- 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) {
- printf ("Unable to open output <%s>\n", cname);
- exit(1);
- }
-
- fprintf (fpout, "/* DataToC output of file <%s> */\n\n",argv[1]);
- fprintf (fpout, "int datatoc_%s_size= %s;\n", argv[1], sizest);
- /*
- fprintf (fpout, "char datatoc_%s[]= {\"", argv[1]);
-
- while (size--) {
- if(size%256==0)
- fprintf(fpout, "\" \\\n\"");
-
- fprintf (fpout, "\\x%02x", getc(fpin));
- }
-
- fprintf (fpout, "\"};\n");
- */
-
- fprintf (fpout, "char datatoc_%s[]= {\n", argv[1]);
- while (size--) {
- if(size%32==31)
- fprintf(fpout, "\n");
-
- /* 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");
-
- fclose(fpin);
- fclose(fpout);
- return 0;
-}
Modified: branches/itasc/release/datafiles/datatoc.py
===================================================================
--- branches/itasc/release/datafiles/datatoc.py 2009-09-01 21:07:19 UTC (rev 22938)
+++ branches/itasc/release/datafiles/datatoc.py 2009-09-01 22:41:15 UTC (rev 22939)
@@ -1,5 +1,6 @@
-#!/usr/bin/python3
-#
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -23,10 +24,10 @@
#
# ***** END GPL LICENCE BLOCK *****
-import sys
+import sys, os
if len(sys.argv) < 2:
- print("Usage: datatoc <data_file>")
+ sys.stdout.write("Usage: datatoc <data_file>\n")
sys.exit(1)
filename = sys.argv[1]
@@ -34,37 +35,39 @@
try:
fpin = open(filename, "rb");
except:
- print("Unable to open input <{0}>".format(sys.argv[1]))
+ sys.stdout.write("Unable to open input %s\n" % sys.argv[1])
sys.exit(1)
-size = fpin.seek(0, 2)
+fpin.seek(0, os.SEEK_END)
+size = fpin.tell()
fpin.seek(0)
if filename[0] == ".":
filename = filename[1:]
cname = filename + ".c"
-print("Making C file <{0}>".format(cname))
+sys.stdout.write("Making C file <%s>\n" % cname)
filename = filename.replace(".", "_")
-
+sys.stdout.write(str(size))
+sys.stdout.write("\n")
try:
fpout = open(cname, "w")
except:
- print("Unable to open output <{0}>".format(cname))
+ sys.stdout.write("Unable to open output %s\n" % cname)
sys.exit(1)
-fpout.write("/* DataToC output of file <{0}> */\n\n".format(filename))
-fpout.write("int datatoc_{0}_size= {1};\n".format(filename, size))
+fpout.write("/* DataToC output of file <%s> */\n\n" % filename)
+fpout.write("int datatoc_%s_size= %d;\n" % (filename, size))
-fpout.write("char datatoc_{0}[]= {{\n".format(filename))
+fpout.write("char datatoc_%s[]= {\n" % filename)
while size > 0:
size -= 1
if size % 32 == 31:
fpout.write("\n")
- fpout.write("{0:3d},".format(ord(fpin.read(1))))
+ fpout.write("%3d," % ord(fpin.read(1)))
fpout.write("\n 0};\n\n")
Property changes on: branches/itasc/release/datafiles/datatoc.py
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/itasc/release/io/engine_render_pov.py
===================================================================
--- branches/itasc/release/io/engine_render_pov.py 2009-09-01 21:07:19 UTC (rev 22938)
+++ branches/itasc/release/io/engine_render_pov.py 2009-09-01 22:41:15 UTC (rev 22939)
@@ -82,8 +82,8 @@
file.write('#declare %s = finish {\n' % name)
if material:
- file.write('\tdiffuse %.3g\n' % material.diffuse_reflection)
- file.write('\tspecular %.3g\n' % material.specular_reflection)
+ file.write('\tdiffuse %.3g\n' % material.diffuse_intensity)
+ file.write('\tspecular %.3g\n' % material.specular_intensity)
file.write('\tambient %.3g\n' % material.ambient)
#file.write('\tambient rgb <%.3g, %.3g, %.3g>\n' % tuple([c*material.ambient for c in world.ambient_color])) # povray blends the global value
@@ -101,10 +101,10 @@
if material.raytrace_mirror.enabled:
raytrace_mirror= material.raytrace_mirror
- if raytrace_mirror.reflect:
+ if raytrace_mirror.reflect_factor:
file.write('\treflection {\n')
file.write('\t\trgb <%.3g, %.3g, %.3g>' % tuple(material.mirror_color))
- file.write('\t\tfresnel 1 falloff %.3g exponent %.3g metallic %.3g} ' % (raytrace_mirror.fresnel, raytrace_mirror.fresnel_fac, raytrace_mirror.reflect))
+ file.write('\t\tfresnel 1 falloff %.3g exponent %.3g metallic %.3g} ' % (raytrace_mirror.fresnel, raytrace_mirror.fresnel_factor, raytrace_mirror.reflect_factor))
else:
file.write('\tdiffuse 0.8\n')
@@ -300,14 +300,7 @@
try: vcol_layer = me.active_vertex_color.data
except:vcol_layer = None
-
- def regular_face(f):
- fv = f.verts
- if fv[3]== 0:
- return fv[0], fv[1], fv[2]
- return fv[0], fv[1], fv[2], fv[3]
-
- faces_verts = [regular_face(f) for f in me.faces]
+ faces_verts = [f.verts for f in me.faces]
faces_normals = [tuple(f.normal) for f in me.faces]
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list