Revision: 29246
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29246
Author: blendix
Date: 2010-06-05 18:09:35 +0200 (Sat, 05 Jun 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29216:29245
Modified Paths:
--------------
branches/render25/SConstruct
branches/render25/config/linuxcross-config.py
branches/render25/config/win32-mingw-config.py
branches/render25/source/blender/blenkernel/intern/scene.c
branches/render25/source/blender/blenkernel/intern/writeffmpeg.c
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/object/object_edit.c
branches/render25/source/blender/editors/space_file/CMakeLists.txt
branches/render25/source/blender/editors/space_graph/CMakeLists.txt
branches/render25/source/blender/editors/space_image/CMakeLists.txt
branches/render25/source/blender/editors/space_info/CMakeLists.txt
branches/render25/source/blender/editors/space_info/SConscript
branches/render25/source/blender/editors/space_logic/CMakeLists.txt
branches/render25/source/blender/editors/space_nla/CMakeLists.txt
branches/render25/source/blender/editors/space_node/CMakeLists.txt
branches/render25/source/blender/editors/space_node/node_edit.c
branches/render25/source/blender/editors/space_outliner/CMakeLists.txt
branches/render25/source/blender/editors/space_outliner/outliner.c
branches/render25/source/blender/editors/space_script/CMakeLists.txt
branches/render25/source/blender/editors/space_sequencer/CMakeLists.txt
branches/render25/source/blender/editors/space_sound/CMakeLists.txt
branches/render25/source/blender/editors/space_text/CMakeLists.txt
branches/render25/source/blender/editors/space_time/CMakeLists.txt
branches/render25/source/blender/editors/space_userpref/CMakeLists.txt
branches/render25/source/blender/editors/space_userpref/SConscript
branches/render25/source/blender/editors/space_view3d/CMakeLists.txt
branches/render25/source/blender/editors/transform/CMakeLists.txt
branches/render25/source/blender/editors/util/CMakeLists.txt
branches/render25/source/blender/editors/uvedit/CMakeLists.txt
branches/render25/source/blender/imbuf/intern/anim.c
branches/render25/source/blender/imbuf/intern/thumbs_blend.c
branches/render25/source/blender/makesrna/RNA_types.h
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/blender/python/doc/sphinx_doc_gen.py
branches/render25/source/blender/python/intern/bpy_props.c
branches/render25/source/blender/python/intern/bpy_props.h
branches/render25/source/blender/python/intern/bpy_rna.c
branches/render25/source/gameengine/GameLogic/SCA_PythonMouse.cpp
branches/render25/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/render25/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
branches/render25/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
branches/render25/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/render25/source/gameengine/Network/TerraplayNetwork/NG_TerraplayNetworkDeviceInterface.h
branches/render25/source/gameengine/VideoTexture/ImageBase.cpp
branches/render25/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/render25/tools/Blender.py
Property Changed:
----------------
branches/render25/source/blender/editors/animation/CMakeLists.txt
branches/render25/source/blender/editors/armature/CMakeLists.txt
branches/render25/source/blender/editors/curve/CMakeLists.txt
branches/render25/source/blender/editors/datafiles/CMakeLists.txt
branches/render25/source/blender/editors/gpencil/CMakeLists.txt
branches/render25/source/blender/editors/interface/CMakeLists.txt
branches/render25/source/blender/editors/mesh/CMakeLists.txt
branches/render25/source/blender/editors/metaball/CMakeLists.txt
branches/render25/source/blender/editors/object/CMakeLists.txt
branches/render25/source/blender/editors/physics/CMakeLists.txt
branches/render25/source/blender/editors/render/CMakeLists.txt
branches/render25/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/render25/source/blender/editors/sound/CMakeLists.txt
branches/render25/source/blender/editors/space_action/CMakeLists.txt
branches/render25/source/blender/editors/space_api/CMakeLists.txt
branches/render25/source/blender/editors/space_buttons/CMakeLists.txt
branches/render25/source/blender/editors/space_console/CMakeLists.txt
branches/render25/source/blender/editors/space_file/CMakeLists.txt
branches/render25/source/blender/editors/space_graph/CMakeLists.txt
branches/render25/source/blender/editors/space_image/CMakeLists.txt
branches/render25/source/blender/editors/space_info/CMakeLists.txt
branches/render25/source/blender/editors/space_logic/CMakeLists.txt
branches/render25/source/blender/editors/space_nla/CMakeLists.txt
branches/render25/source/blender/editors/space_node/CMakeLists.txt
branches/render25/source/blender/editors/space_outliner/CMakeLists.txt
branches/render25/source/blender/editors/space_script/CMakeLists.txt
branches/render25/source/blender/editors/space_sequencer/CMakeLists.txt
branches/render25/source/blender/editors/space_sound/CMakeLists.txt
branches/render25/source/blender/editors/space_text/CMakeLists.txt
branches/render25/source/blender/editors/space_time/CMakeLists.txt
branches/render25/source/blender/editors/space_userpref/CMakeLists.txt
branches/render25/source/blender/editors/space_view3d/CMakeLists.txt
branches/render25/source/blender/editors/transform/CMakeLists.txt
branches/render25/source/blender/editors/util/CMakeLists.txt
branches/render25/source/blender/editors/uvedit/CMakeLists.txt
Modified: branches/render25/SConstruct
===================================================================
--- branches/render25/SConstruct 2010-06-05 16:04:13 UTC (rev 29245)
+++ branches/render25/SConstruct 2010-06-05 16:09:35 UTC (rev 29246)
@@ -201,6 +201,7 @@
SetOption('num_jobs', int(env['BF_NUMJOBS']))
print B.bc.OKGREEN + "Build with parallel jobs%s: %s" % (B.bc.ENDC,
GetOption('num_jobs'))
+print B.bc.OKGREEN + "Build with debug symbols%s: %s" % (B.bc.ENDC,
env['BF_DEBUG'])
# BLENDERPATH is a unix only option to enable typical style paths this is
# spesifically a data-dir, which is used a lot but cant replace BF_INSTALLDIR
Modified: branches/render25/config/linuxcross-config.py
===================================================================
--- branches/render25/config/linuxcross-config.py 2010-06-05 16:04:13 UTC
(rev 29245)
+++ branches/render25/config/linuxcross-config.py 2010-06-05 16:09:35 UTC
(rev 29246)
@@ -65,7 +65,7 @@
WITH_BF_JPEG = True
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIB = 'libjpeg'
BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
WITH_BF_PNG = True
@@ -83,7 +83,7 @@
WITH_BF_ZLIB = True
BF_ZLIB = LIBDIR + '/zlib'
BF_ZLIB_INC = '${BF_ZLIB}/include'
-#BF_ZLIB_LIB = 'z'
+BF_ZLIB_LIB = 'libz'
BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
WITH_BF_INTERNATIONAL = True
Modified: branches/render25/config/win32-mingw-config.py
===================================================================
--- branches/render25/config/win32-mingw-config.py 2010-06-05 16:04:13 UTC
(rev 29245)
+++ branches/render25/config/win32-mingw-config.py 2010-06-05 16:09:35 UTC
(rev 29246)
@@ -64,7 +64,7 @@
WITH_BF_JPEG = True
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIB = 'liblibjpeg'
BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
WITH_BF_PNG = True
@@ -82,6 +82,7 @@
WITH_BF_ZLIB = True
BF_ZLIB = LIBDIR + '/zlib'
BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'libz'
BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
WITH_BF_INTERNATIONAL = True
Modified: branches/render25/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/scene.c 2010-06-05
16:04:13 UTC (rev 29245)
+++ branches/render25/source/blender/blenkernel/intern/scene.c 2010-06-05
16:09:35 UTC (rev 29246)
@@ -310,7 +310,7 @@
int a;
sce= alloc_libblock(&G.main->scene, ID_SCE, name);
- sce->lay= 1;
+ sce->lay= sce->layact= 1;
sce->r.mode=
R_GAMMA|R_OSA|R_SHADOW|R_SSS|R_ENVMAP|R_RAYTRACE|R_SUBDIVISION;
sce->r.cfra= 1;
Modified: branches/render25/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/writeffmpeg.c
2010-06-05 16:04:13 UTC (rev 29245)
+++ branches/render25/source/blender/blenkernel/intern/writeffmpeg.c
2010-06-05 16:09:35 UTC (rev 29246)
@@ -362,7 +362,7 @@
}
if (c->pix_fmt != PIX_FMT_BGR32) {
- sws_scale(img_convert_ctx, (const uint8_t * const*)
rgb_frame->data,
+ sws_scale(img_convert_ctx, (uint8_t **) rgb_frame->data,
rgb_frame->linesize, 0, c->height,
current_frame->data, current_frame->linesize);
delete_picture(rgb_frame);
Property changes on:
branches/render25/source/blender/editors/animation/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/armature/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/curve/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/datafiles/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/gpencil/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/interface/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/mesh/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/metaball/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/object/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: branches/render25/source/blender/editors/object/object_add.c
===================================================================
--- branches/render25/source/blender/editors/object/object_add.c
2010-06-05 16:04:13 UTC (rev 29245)
+++ branches/render25/source/blender/editors/object/object_add.c
2010-06-05 16:09:35 UTC (rev 29246)
@@ -1055,7 +1055,7 @@
static EnumPropertyItem convert_target_items[]= {
{OB_CURVE, "CURVE", ICON_OUTLINER_OB_CURVE, "Curve from Mesh/Text", ""},
- {OB_MESH, "MESH", ICON_OUTLINER_OB_MESH, "Mesh from
Curve/Meta/Surf/Mesh", ""},
+ {OB_MESH, "MESH", ICON_OUTLINER_OB_MESH, "Mesh from
Curve/Meta/Surf/Text", ""},
{0, NULL, 0, NULL, NULL}};
static void curvetomesh(Scene *scene, Object *ob)
Modified: branches/render25/source/blender/editors/object/object_edit.c
===================================================================
--- branches/render25/source/blender/editors/object/object_edit.c
2010-06-05 16:04:13 UTC (rev 29245)
+++ branches/render25/source/blender/editors/object/object_edit.c
2010-06-05 16:09:35 UTC (rev 29246)
@@ -2306,9 +2306,6 @@
static int game_property_clear_exec(bContext *C, wmOperator *op)
{
- Object *ob=ED_object_active_context(C);
- bProperty *prop;
-
CTX_DATA_BEGIN(C, Object*, ob_iter, selected_editable_objects) {
free_properties(&ob_iter->prop);
}
Property changes on:
branches/render25/source/blender/editors/physics/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/render/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/sculpt_paint/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/sound/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/space_action/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/space_api/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/space_buttons/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Property changes on:
branches/render25/source/blender/editors/space_console/CMakeLists.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: branches/render25/source/blender/editors/space_file/CMakeLists.txt
===================================================================
--- branches/render25/source/blender/editors/space_file/CMakeLists.txt
2010-06-05 16:04:13 UTC (rev 29245)
+++ branches/render25/source/blender/editors/space_file/CMakeLists.txt
2010-06-05 16:09:35 UTC (rev 29246)
@@ -27,43 +27,20 @@
FILE(GLOB SRC *.c)
SET(INC
- ../../windowmanager
- ../../editors/include
- ../../editors/interface
- ../../../../intern/guardedalloc
- ../../../../intern/memutil
- ../../blenlib ../../makesdna
- ../../makesrna ../../blenkernel
- ../../include ../../imbuf
- ../../render/extern/include
- ../../../../intern/bsp/extern
- ../../../../intern/decimation/extern
+ ../../blenfont
+ ../../blenkernel
+ ../../blenlib
../../blenloader
- ../../python
- ../../../kernel/gen_system
- ../../readstreamglue
- ../../../../intern/elbeem/extern
- ../../../../intern/ghost
- ../../../../intern/opennl/extern
- ../../../../extern/glew/include
- ../../../../intern/smoke/extern
+ ../../imbuf
+ ../include
../../../../intern/audaspace/intern
- ../../nodes
- ../../gpu
- ../../blenfont
- ../../ikplugin
+ ../../../../intern/guardedalloc
+ ../../makesdna
+ ../../makesrna
+ ../../render/extern/include
+ ../../windowmanager
)
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
- ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
- ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
IF(WITH_OPENEXR)
ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_OPENEXR)
@@ -76,36 +53,12 @@
ADD_DEFINITIONS(-DWITH_OPENJPEG)
ENDIF(WITH_OPENJPEG)
-IF(WITH_QUICKTIME)
- SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
- ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
+IF(WITH_DDS)
+ ADD_DEFINITIONS(-DWITH_DDS)
+ENDIF(WITH_DDS)
-IF(WITH_FFMPEG)
- SET(INC ${INC} ${FFMPEG_INC})
- ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
- ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
- ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
