[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22938] branches/ge_dyn_load: svn merge https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/ blender -r22876:22937
Campbell Barton
ideasman42 at gmail.com
Tue Sep 1 23:07:19 CEST 2009
Revision: 22938
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22938
Author: campbellbarton
Date: 2009-09-01 23:07:19 +0200 (Tue, 01 Sep 2009)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender -r22876:22937
(somehow missed netrender, not worrying about it for now)
Modified Paths:
--------------
branches/ge_dyn_load/CMakeLists.txt
branches/ge_dyn_load/config/win32-mingw-config.py
branches/ge_dyn_load/extern/xvidcore/build/generic/configure
branches/ge_dyn_load/extern/xvidcore/build/generic/configure.in
branches/ge_dyn_load/release/datafiles/splash.jpg
branches/ge_dyn_load/release/ui/buttons_data_armature.py
branches/ge_dyn_load/release/ui/buttons_data_bone.py
branches/ge_dyn_load/release/ui/buttons_data_camera.py
branches/ge_dyn_load/release/ui/buttons_data_curve.py
branches/ge_dyn_load/release/ui/buttons_data_lamp.py
branches/ge_dyn_load/release/ui/buttons_data_lattice.py
branches/ge_dyn_load/release/ui/buttons_data_mesh.py
branches/ge_dyn_load/release/ui/buttons_data_modifier.py
branches/ge_dyn_load/release/ui/buttons_data_text.py
branches/ge_dyn_load/release/ui/buttons_game.py
branches/ge_dyn_load/release/ui/buttons_material.py
branches/ge_dyn_load/release/ui/buttons_physics_cloth.py
branches/ge_dyn_load/release/ui/buttons_physics_field.py
branches/ge_dyn_load/release/ui/buttons_physics_fluid.py
branches/ge_dyn_load/release/ui/buttons_physics_smoke.py
branches/ge_dyn_load/release/ui/buttons_physics_softbody.py
branches/ge_dyn_load/release/ui/buttons_scene.py
branches/ge_dyn_load/release/ui/buttons_texture.py
branches/ge_dyn_load/release/ui/buttons_world.py
branches/ge_dyn_load/release/ui/space_image.py
branches/ge_dyn_load/release/ui/space_info.py
branches/ge_dyn_load/release/ui/space_node.py
branches/ge_dyn_load/release/ui/space_sequencer.py
branches/ge_dyn_load/release/ui/space_text.py
branches/ge_dyn_load/release/ui/space_time.py
branches/ge_dyn_load/release/ui/space_view3d.py
branches/ge_dyn_load/release/ui/space_view3d_toolbar.py
branches/ge_dyn_load/source/blender/blenkernel/BKE_shrinkwrap.h
branches/ge_dyn_load/source/blender/blenkernel/intern/armature.c
branches/ge_dyn_load/source/blender/blenkernel/intern/gpencil.c
branches/ge_dyn_load/source/blender/blenkernel/intern/shrinkwrap.c
branches/ge_dyn_load/source/blender/blenkernel/intern/sound.c
branches/ge_dyn_load/source/blender/blenlib/BLI_arithb.h
branches/ge_dyn_load/source/blender/blenlib/intern/arithb.c
branches/ge_dyn_load/source/blender/editors/gpencil/drawgpencil.c
branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_buttons.c
branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_edit.c
branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_intern.h
branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_ops.c
branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_paint.c
branches/ge_dyn_load/source/blender/editors/include/ED_gpencil.h
branches/ge_dyn_load/source/blender/editors/include/ED_screen.h
branches/ge_dyn_load/source/blender/editors/interface/interface_handlers.c
branches/ge_dyn_load/source/blender/editors/interface/view2d_ops.c
branches/ge_dyn_load/source/blender/editors/screen/area.c
branches/ge_dyn_load/source/blender/editors/space_api/spacetypes.c
branches/ge_dyn_load/source/blender/editors/space_file/file_panels.c
branches/ge_dyn_load/source/blender/editors/space_image/image_buttons.c
branches/ge_dyn_load/source/blender/editors/space_image/image_draw.c
branches/ge_dyn_load/source/blender/editors/space_image/image_intern.h
branches/ge_dyn_load/source/blender/editors/space_image/space_image.c
branches/ge_dyn_load/source/blender/editors/space_view3d/space_view3d.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_draw.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_ops.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_view.c
branches/ge_dyn_load/source/blender/editors/transform/transform.c
branches/ge_dyn_load/source/blender/editors/transform/transform_conversions.c
branches/ge_dyn_load/source/blender/editors/transform/transform_generics.c
branches/ge_dyn_load/source/blender/makesdna/DNA_action_types.h
branches/ge_dyn_load/source/blender/makesrna/intern/CMakeLists.txt
branches/ge_dyn_load/source/blender/makesrna/intern/Makefile
branches/ge_dyn_load/source/blender/makesrna/intern/SConscript
branches/ge_dyn_load/source/blender/makesrna/intern/rna_fluidsim.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_gpencil.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_material.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_object.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_pose.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_scene.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_texture.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_userdef.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_world.c
branches/ge_dyn_load/source/blender/render/intern/include/render_types.h
branches/ge_dyn_load/source/blender/render/intern/source/convertblender.c
branches/ge_dyn_load/source/blender/render/intern/source/volumetric.c
branches/ge_dyn_load/source/blender/windowmanager/intern/wm_files.c
branches/ge_dyn_load/source/gameengine/Ketsji/KX_GameObject.cpp
branches/ge_dyn_load/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/ge_dyn_load/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/ge_dyn_load/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/ge_dyn_load/source/gameengine/Rasterizer/RAS_Polygon.cpp
branches/ge_dyn_load/source/gameengine/Rasterizer/RAS_Polygon.h
Removed Paths:
-------------
branches/ge_dyn_load/release/datafiles/datatoc.c
Modified: branches/ge_dyn_load/CMakeLists.txt
===================================================================
--- branches/ge_dyn_load/CMakeLists.txt 2009-09-01 20:45:45 UTC (rev 22937)
+++ branches/ge_dyn_load/CMakeLists.txt 2009-09-01 21:07:19 UTC (rev 22938)
@@ -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/ge_dyn_load/config/win32-mingw-config.py
===================================================================
--- branches/ge_dyn_load/config/win32-mingw-config.py 2009-09-01 20:45:45 UTC (rev 22937)
+++ branches/ge_dyn_load/config/win32-mingw-config.py 2009-09-01 21:07:19 UTC (rev 22938)
@@ -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/ge_dyn_load/extern/xvidcore/build/generic/configure
===================================================================
--- branches/ge_dyn_load/extern/xvidcore/build/generic/configure 2009-09-01 20:45:45 UTC (rev 22937)
+++ branches/ge_dyn_load/extern/xvidcore/build/generic/configure 2009-09-01 21:07:19 UTC (rev 22938)
@@ -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/ge_dyn_load/extern/xvidcore/build/generic/configure.in
===================================================================
--- branches/ge_dyn_load/extern/xvidcore/build/generic/configure.in 2009-09-01 20:45:45 UTC (rev 22937)
+++ branches/ge_dyn_load/extern/xvidcore/build/generic/configure.in 2009-09-01 21:07:19 UTC (rev 22938)
@@ -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/ge_dyn_load/release/datafiles/datatoc.c
===================================================================
--- branches/ge_dyn_load/release/datafiles/datatoc.c 2009-09-01 20:45:45 UTC (rev 22937)
+++ branches/ge_dyn_load/release/datafiles/datatoc.c 2009-09-01 21:07:19 UTC (rev 22938)
@@ -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/ge_dyn_load/release/datafiles/splash.jpg
===================================================================
(Binary files differ)
Modified: branches/ge_dyn_load/release/ui/buttons_data_armature.py
===================================================================
--- branches/ge_dyn_load/release/ui/buttons_data_armature.py 2009-09-01 20:45:45 UTC (rev 22937)
+++ branches/ge_dyn_load/release/ui/buttons_data_armature.py 2009-09-01 21:07:19 UTC (rev 22938)
@@ -83,7 +83,7 @@
layout = self.layout
ob = context.object
- pose= ob.pose
+ pose = ob.pose
row = layout.row()
row.template_list(pose, "bone_groups", pose, "active_bone_group_index")
Modified: branches/ge_dyn_load/release/ui/buttons_data_bone.py
===================================================================
--- branches/ge_dyn_load/release/ui/buttons_data_bone.py 2009-09-01 20:45:45 UTC (rev 22937)
+++ branches/ge_dyn_load/release/ui/buttons_data_bone.py 2009-09-01 21:07:19 UTC (rev 22938)
@@ -77,6 +77,7 @@
ob = context.object
bone = context.bone
arm = context.armature
+
if not bone:
bone = context.edit_bone
else:
@@ -192,18 +193,18 @@
__default_closed__ = True
def draw_header(self, context):
- layout = self.layout
+ bone = context.bone
- bone = context.bone
if not bone:
bone = context.edit_bone
- layout.itemR(bone, "deform", text="")
+ self.layout.itemR(bone, "deform", text="")
def draw(self, context):
layout = self.layout
bone = context.bone
+
if not bone:
bone = context.edit_bone
Modified: branches/ge_dyn_load/release/ui/buttons_data_camera.py
===================================================================
--- branches/ge_dyn_load/release/ui/buttons_data_camera.py 2009-09-01 20:45:45 UTC (rev 22937)
+++ branches/ge_dyn_load/release/ui/buttons_data_camera.py 2009-09-01 21:07:19 UTC (rev 22938)
@@ -7,7 +7,7 @@
__context__ = "data"
def poll(self, context):
- return (context.camera != None)
+ return (context.camera)
class DATA_PT_context_camera(DataButtonsPanel):
__show_header__ = False
@@ -49,7 +49,7 @@
elif cam.type == 'ORTHO':
row.itemR(cam, "ortho_scale")
- layout.itemR(cam, "panorama");
+ layout.itemR(cam, "panorama")
split = layout.split()
Modified: branches/ge_dyn_load/release/ui/buttons_data_curve.py
===================================================================
--- branches/ge_dyn_load/release/ui/buttons_data_curve.py 2009-09-01 20:45:45 UTC (rev 22937)
+++ branches/ge_dyn_load/release/ui/buttons_data_curve.py 2009-09-01 21:07:19 UTC (rev 22938)
@@ -38,33 +38,34 @@
curve = context.curve
space = context.space_data
- if curve:
- layout.itemR(curve, "curve_2d")
+ layout.itemR(curve, "curve_2d")
- split = layout.split()
+ split = layout.split()
- col = split.column()
- colsub = col.column()
- colsub.active = curve.curve_2d
- colsub.itemL(text="Caps:")
- colsub.itemR(curve, "front")
- colsub.itemR(curve, "back")
+ col = split.column()
+ sub = col.column()
+ sub.active = curve.curve_2d
+ sub.itemL(text="Caps:")
+ sub.itemR(curve, "front")
+ sub.itemR(curve, "back")
- col.itemL(text="Textures:")
-# col.itemR(curve, "uv_orco")
- col.itemR(curve, "auto_texspace")
+ col.itemL(text="Textures:")
+# col.itemR(curve, "uv_orco")
+ col.itemR(curve, "auto_texspace")
- sub = split.column()
- sub.itemL(text="Resolution:")
- sub.itemR(curve, "resolution_u", text="Preview U")
- sub.itemR(curve, "resolution_v", text="Preview V")
- sub.itemR(curve, "render_resolution_u", text="Render U")
- sub.itemR(curve, "render_resolution_v", text="Render V")
+ col = split.column()
+ col.itemL(text="Resolution:")
+ sub = col.column(align=True)
+ sub.itemR(curve, "resolution_u", text="Preview U")
+ sub.itemR(curve, "render_resolution_u", text="Render U")
+ sub = col.column(align=True)
+ sub.itemR(curve, "resolution_v", text="Preview V")
+ sub.itemR(curve, "render_resolution_v", text="Render V")
-# sub.itemL(text="Display:")
-# sub.itemL(text="HANDLES")
-# sub.itemL(text="NORMALS")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list