[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28955] branches/soc-2010-kwk: merge 28819 :28953
Konrad Kleine
konrad at konradwilhelm.de
Mon May 24 14:15:37 CEST 2010
Revision: 28955
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28955
Author: kwk
Date: 2010-05-24 14:15:37 +0200 (Mon, 24 May 2010)
Log Message:
-----------
merge 28819:28953
Modified Paths:
--------------
branches/soc-2010-kwk/CMake/macros.cmake
branches/soc-2010-kwk/CMakeLists.txt
branches/soc-2010-kwk/SConstruct
branches/soc-2010-kwk/config/darwin-config.py
branches/soc-2010-kwk/config/linux2-config.py
branches/soc-2010-kwk/config/linuxcross-config.py
branches/soc-2010-kwk/config/win32-mingw-config.py
branches/soc-2010-kwk/config/win32-vc-config.py
branches/soc-2010-kwk/config/win64-vc-config.py
branches/soc-2010-kwk/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-kwk/release/scripts/io/export_fbx.py
branches/soc-2010-kwk/release/scripts/io/import_anim_bvh.py
branches/soc-2010-kwk/release/scripts/keyingsets/keyingsets_utils.py
branches/soc-2010-kwk/release/scripts/op/add_mesh_torus.py
branches/soc-2010-kwk/release/scripts/op/object.py
branches/soc-2010-kwk/release/scripts/op/uv.py
branches/soc-2010-kwk/release/scripts/ui/properties_animviz.py
branches/soc-2010-kwk/release/scripts/ui/properties_render.py
branches/soc-2010-kwk/release/scripts/ui/space_info.py
branches/soc-2010-kwk/release/scripts/ui/space_view3d.py
branches/soc-2010-kwk/source/blender/blenkernel/BKE_global.h
branches/soc-2010-kwk/source/blender/blenkernel/BKE_multires.h
branches/soc-2010-kwk/source/blender/blenkernel/CMakeLists.txt
branches/soc-2010-kwk/source/blender/blenkernel/SConscript
branches/soc-2010-kwk/source/blender/blenkernel/intern/Makefile
branches/soc-2010-kwk/source/blender/blenkernel/intern/anim.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/armature.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/image.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/multires.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/packedFile.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-kwk/source/blender/blenlib/BLI_args.h
branches/soc-2010-kwk/source/blender/blenlib/intern/BLI_args.c
branches/soc-2010-kwk/source/blender/blenloader/intern/readfile.c
branches/soc-2010-kwk/source/blender/editors/CMakeLists.txt
branches/soc-2010-kwk/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2010-kwk/source/blender/editors/animation/anim_filter.c
branches/soc-2010-kwk/source/blender/editors/curve/curve_intern.h
branches/soc-2010-kwk/source/blender/editors/curve/curve_ops.c
branches/soc-2010-kwk/source/blender/editors/curve/editcurve.c
branches/soc-2010-kwk/source/blender/editors/include/ED_anim_api.h
branches/soc-2010-kwk/source/blender/editors/interface/interface_regions.c
branches/soc-2010-kwk/source/blender/editors/object/object_add.c
branches/soc-2010-kwk/source/blender/editors/object/object_edit.c
branches/soc-2010-kwk/source/blender/editors/object/object_intern.h
branches/soc-2010-kwk/source/blender/editors/object/object_modifier.c
branches/soc-2010-kwk/source/blender/editors/object/object_ops.c
branches/soc-2010-kwk/source/blender/editors/render/render_internal.c
branches/soc-2010-kwk/source/blender/editors/render/render_opengl.c
branches/soc-2010-kwk/source/blender/editors/screen/screen_ops.c
branches/soc-2010-kwk/source/blender/editors/space_action/action_edit.c
branches/soc-2010-kwk/source/blender/editors/space_action/action_select.c
branches/soc-2010-kwk/source/blender/editors/space_file/Makefile
branches/soc-2010-kwk/source/blender/editors/space_file/SConscript
branches/soc-2010-kwk/source/blender/editors/space_file/writeimage.c
branches/soc-2010-kwk/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-kwk/source/blender/editors/space_graph/graph_edit.c
branches/soc-2010-kwk/source/blender/editors/space_graph/graph_select.c
branches/soc-2010-kwk/source/blender/editors/space_graph/space_graph.c
branches/soc-2010-kwk/source/blender/editors/space_image/Makefile
branches/soc-2010-kwk/source/blender/editors/space_image/SConscript
branches/soc-2010-kwk/source/blender/editors/space_image/image_ops.c
branches/soc-2010-kwk/source/blender/editors/space_logic/logic_ops.c
branches/soc-2010-kwk/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-kwk/source/blender/editors/space_nla/nla_select.c
branches/soc-2010-kwk/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-kwk/source/blender/editors/space_text/space_text.c
branches/soc-2010-kwk/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2010-kwk/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-kwk/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-kwk/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-kwk/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-kwk/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-kwk/source/blender/gpu/GPU_draw.h
branches/soc-2010-kwk/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-kwk/source/blender/imbuf/CMakeLists.txt
branches/soc-2010-kwk/source/blender/imbuf/SConscript
branches/soc-2010-kwk/source/blender/imbuf/intern/Makefile
branches/soc-2010-kwk/source/blender/imbuf/intern/anim.c
branches/soc-2010-kwk/source/blender/imbuf/intern/filetype.c
branches/soc-2010-kwk/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2010-kwk/source/blender/imbuf/intern/tiff.c
branches/soc-2010-kwk/source/blender/imbuf/intern/util.c
branches/soc-2010-kwk/source/blender/makesdna/DNA_action_types.h
branches/soc-2010-kwk/source/blender/makesdna/DNA_object_types.h
branches/soc-2010-kwk/source/blender/makesrna/SConscript
branches/soc-2010-kwk/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2010-kwk/source/blender/makesrna/intern/Makefile
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_animation.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_image.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_internal.h
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_material.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_texture.c
branches/soc-2010-kwk/source/blender/python/intern/bpy_app.c
branches/soc-2010-kwk/source/blender/python/intern/bpy_driver.c
branches/soc-2010-kwk/source/blender/render/intern/source/pipeline.c
branches/soc-2010-kwk/source/blender/render/intern/source/rendercore.c
branches/soc-2010-kwk/source/blender/render/intern/source/texture.c
branches/soc-2010-kwk/source/creator/CMakeLists.txt
branches/soc-2010-kwk/source/creator/Makefile
branches/soc-2010-kwk/source/creator/SConscript
branches/soc-2010-kwk/source/creator/creator.c
branches/soc-2010-kwk/source/nan_definitions.mk
branches/soc-2010-kwk/source/nan_link.mk
branches/soc-2010-kwk/tools/Blender.py
branches/soc-2010-kwk/tools/btools.py
branches/soc-2010-kwk/tools/crossmingw.py
Added Paths:
-----------
branches/soc-2010-kwk/release/scripts/modules/add_object_utils.py
branches/soc-2010-kwk/release/scripts/templates/operator_modal_view3d.py
Removed Paths:
-------------
branches/soc-2010-kwk/source/blender/imbuf/intern/dynlibtiff.c
branches/soc-2010-kwk/source/blender/imbuf/intern/dynlibtiff.h
Modified: branches/soc-2010-kwk/CMake/macros.cmake
===================================================================
--- branches/soc-2010-kwk/CMake/macros.cmake 2010-05-24 11:53:35 UTC (rev 28954)
+++ branches/soc-2010-kwk/CMake/macros.cmake 2010-05-24 12:15:37 UTC (rev 28955)
@@ -61,6 +61,9 @@
IF(WITH_OPENEXR)
LINK_DIRECTORIES(${OPENEXR_LIBPATH})
ENDIF(WITH_OPENEXR)
+ IF(WITH_TIFF)
+ LINK_DIRECTORIES(${TIFF_LIBPATH})
+ ENDIF(WITH_TIFF)
IF(WITH_QUICKTIME)
LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
ENDIF(WITH_QUICKTIME)
@@ -134,6 +137,9 @@
IF(WITH_QUICKTIME)
TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
ENDIF(WITH_QUICKTIME)
+ IF(WITH_TIFF)
+ TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY})
+ ENDIF(WITH_TIFF)
IF(WITH_OPENEXR)
IF(WIN32)
FOREACH(loop_var ${OPENEXR_LIB})
Modified: branches/soc-2010-kwk/CMakeLists.txt
===================================================================
--- branches/soc-2010-kwk/CMakeLists.txt 2010-05-24 11:53:35 UTC (rev 28954)
+++ branches/soc-2010-kwk/CMakeLists.txt 2010-05-24 12:15:37 UTC (rev 28955)
@@ -63,6 +63,7 @@
OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON)
OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
+OPTION(WITH_TIFF "Enable LibTIFF Support" ON)
OPTION(WITH_DDS "Enable DDS Support" ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
@@ -124,11 +125,9 @@
IF(WITH_OPENAL)
FIND_PACKAGE(OpenAL)
- IF(OPENAL_FOUND)
- SET(WITH_OPENAL ON)
- ELSE(OPENAL_FOUND)
+ IF(NOT OPENAL_FOUND)
SET(WITH_OPENAL OFF)
- ENDIF(OPENAL_FOUND)
+ ENDIF(NOT OPENAL_FOUND)
ENDIF(WITH_OPENAL)
IF(WITH_JACK)
@@ -185,11 +184,11 @@
ENDIF(NOT SDL_FOUND)
ENDIF(WITH_SDL)
- SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
+ SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
FIND_PATH(OPENEXR_INC
ImfXdr.h
PATHS
- ${OPENEXR}/include/OpenEXR
+ ${OPENEXR}/include/OpenEXR
/usr/local/include/OpenEXR
/sw/include/OpenEXR
/opt/local/include/OpenEXR
@@ -215,6 +214,13 @@
SET(LIBSAMPLERATE_LIB samplerate)
SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+ IF(WITH_TIFF)
+ FIND_PACKAGE(TIFF)
+ IF(NOT TIFF_FOUND)
+ SET(WITH_TIFF OFF)
+ ENDIF(NOT TIFF_FOUND)
+ ENDIF(WITH_TIFF)
+
FIND_PACKAGE(JPEG REQUIRED)
FIND_PACKAGE(PNG REQUIRED)
@@ -409,7 +415,9 @@
SET(JPEG_LIBPATH ${JPEG}/lib)
SET(TIFF ${LIBDIR}/tiff)
- SET(TIFF_INC ${TIFF}/include)
+ SET(TIFF_INCLUDE_DIR ${TIFF}/include)
+ SET(TIFF_LIBRARY tiff)
+ SET(TIFF_LIBPATH ${TIFF}/lib)
SET(WINTAB_INC ${LIBDIR}/wintab/include)
@@ -478,7 +486,7 @@
# SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}") # not used yet
SET(PYTHON_LIB python${PYTHON_VERSION})
SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}")
- # SET(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
+ # SET(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
ELSE(PYTHON_VERSION MATCHES 3.1)
# otherwise, use custom system framework
@@ -585,7 +593,9 @@
SET(JPEG_LIBPATH ${JPEG}/lib)
SET(TIFF ${LIBDIR}/tiff)
- SET(TIFF_INC ${TIFF}/include)
+ SET(TIFF_INCLUDE_DIR ${TIFF}/include)
+ SET(TIFF_LIBRARY tiff)
+ SET(TIFF_LIBPATH ${TIFF}/lib)
SET(EXETYPE MACOSX_BUNDLE)
Modified: branches/soc-2010-kwk/SConstruct
===================================================================
--- branches/soc-2010-kwk/SConstruct 2010-05-24 11:53:35 UTC (rev 28954)
+++ branches/soc-2010-kwk/SConstruct 2010-05-24 12:15:37 UTC (rev 28955)
@@ -182,7 +182,7 @@
else:
print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC
-opts = btools.read_opts(optfiles, B.arguments)
+opts = btools.read_opts(env, optfiles, B.arguments)
opts.Update(env)
if not env['BF_FANCY']:
Modified: branches/soc-2010-kwk/config/darwin-config.py
===================================================================
--- branches/soc-2010-kwk/config/darwin-config.py 2010-05-24 11:53:35 UTC (rev 28954)
+++ branches/soc-2010-kwk/config/darwin-config.py 2010-05-24 12:15:37 UTC (rev 28955)
@@ -163,8 +163,11 @@
BF_PNG_LIB = 'png'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
+WITH_BF_TIFF = True
BF_TIFF = LIBDIR + '/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'tiff'
+BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
WITH_BF_ZLIB = True
BF_ZLIB = '/usr'
Modified: branches/soc-2010-kwk/config/linux2-config.py
===================================================================
--- branches/soc-2010-kwk/config/linux2-config.py 2010-05-24 11:53:35 UTC (rev 28954)
+++ branches/soc-2010-kwk/config/linux2-config.py 2010-05-24 12:15:37 UTC (rev 28955)
@@ -68,8 +68,10 @@
BF_PNG_INC = '${BF_PNG}/include'
BF_PNG_LIB = 'png'
+WITH_BF_TIFF = True
BF_TIFF = '/usr'
BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'tiff'
WITH_BF_ZLIB = True
BF_ZLIB = '/usr'
Modified: branches/soc-2010-kwk/config/linuxcross-config.py
===================================================================
--- branches/soc-2010-kwk/config/linuxcross-config.py 2010-05-24 11:53:35 UTC (rev 28954)
+++ branches/soc-2010-kwk/config/linuxcross-config.py 2010-05-24 12:15:37 UTC (rev 28955)
@@ -174,9 +174,6 @@
WITH_BF_RAYOPTIMIZATION = False
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
-CC = 'i586-mingw32msvc-gcc'
-CXX = 'i586-mingw32msvc-g++'
-
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS']
Modified: branches/soc-2010-kwk/config/win32-mingw-config.py
===================================================================
--- branches/soc-2010-kwk/config/win32-mingw-config.py 2010-05-24 11:53:35 UTC (rev 28954)
+++ branches/soc-2010-kwk/config/win32-mingw-config.py 2010-05-24 12:15:37 UTC (rev 28955)
@@ -73,6 +73,7 @@
BF_PNG_LIB = 'png'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
+WITH_BF_TIFF = True
BF_TIFF = LIBDIR + '/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
BF_TIFF_LIB = 'libtiff'
Modified: branches/soc-2010-kwk/config/win32-vc-config.py
===================================================================
--- branches/soc-2010-kwk/config/win32-vc-config.py 2010-05-24 11:53:35 UTC (rev 28954)
+++ branches/soc-2010-kwk/config/win32-vc-config.py 2010-05-24 12:15:37 UTC (rev 28955)
@@ -79,6 +79,7 @@
BF_PNG_LIB = 'libpng_st'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
+WITH_BF_TIFF = True
BF_TIFF = LIBDIR + '/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
BF_TIFF_LIB = 'libtiff'
Modified: branches/soc-2010-kwk/config/win64-vc-config.py
===================================================================
--- branches/soc-2010-kwk/config/win64-vc-config.py 2010-05-24 11:53:35 UTC (rev 28954)
+++ branches/soc-2010-kwk/config/win64-vc-config.py 2010-05-24 12:15:37 UTC (rev 28955)
@@ -75,6 +75,7 @@
BF_PNG_LIB = 'libpng'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
+WITH_BF_TIFF = True
BF_TIFF = LIBDIR + '/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
BF_TIFF_LIB = 'libtiff'
Modified: branches/soc-2010-kwk/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2010-kwk/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-05-24 11:53:35 UTC (rev 28954)
+++ branches/soc-2010-kwk/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-05-24 12:15:37 UTC (rev 28955)
@@ -1106,7 +1106,7 @@
{
droppedStr = [droppedArray objectAtIndex:i];
- pastedTextSize = [droppedStr lengthOfBytesUsingEncoding:NSISOLatin1StringEncoding];
+ pastedTextSize = [droppedStr lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
temp_buff = (GHOST_TUns8*) malloc(pastedTextSize+1);
if (!temp_buff) {
@@ -1114,7 +1114,7 @@
break;
}
- strncpy((char*)temp_buff, [droppedStr cStringUsingEncoding:NSISOLatin1StringEncoding], pastedTextSize);
+ strncpy((char*)temp_buff, [droppedStr cStringUsingEncoding:NSUTF8StringEncoding], pastedTextSize);
temp_buff[pastedTextSize] = '\0';
strArray->strings[i] = temp_buff;
@@ -1125,7 +1125,7 @@
case GHOST_kDragnDropTypeString:
droppedStr = (NSString*)data;
- pastedTextSize = [droppedStr lengthOfBytesUsingEncoding:NSISOLatin1StringEncoding];
+ pastedTextSize = [droppedStr lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
temp_buff = (GHOST_TUns8*) malloc(pastedTextSize+1);
@@ -1133,7 +1133,7 @@
return GHOST_kFailure;
}
- strncpy((char*)temp_buff, [droppedStr cStringUsingEncoding:NSISOLatin1StringEncoding], pastedTextSize);
+ strncpy((char*)temp_buff, [droppedStr cStringUsingEncoding:NSUTF8StringEncoding], pastedTextSize);
temp_buff[pastedTextSize] = '\0';
Modified: branches/soc-2010-kwk/release/scripts/io/export_fbx.py
===================================================================
--- branches/soc-2010-kwk/release/scripts/io/export_fbx.py 2010-05-24 11:53:35 UTC (rev 28954)
+++ branches/soc-2010-kwk/release/scripts/io/export_fbx.py 2010-05-24 12:15:37 UTC (rev 28955)
@@ -1504,17 +1504,14 @@
file.write('\n\t\tPolygonVertexIndex: ')
i=-1
for f in me.faces:
- fi = [v for v in f.verts]
- # fi = [v_index for j, v_index in enumerate(f.verts) if v_index != 0 or j != 3]
-# fi = [v.index for v in f]
+ fi = f.verts[:]
- # flip the last index, odd but it looks like
- # this is how fbx tells one face from another
- fi[-1] = -(fi[-1]+1)
+ # last index XORd w. -1 indicates end of face
+ fi[-1] = fi[-1] ^ -1
fi = tuple(fi)
+
if i==-1:
if len(fi) == 3: file.write('%i,%i,%i' % fi )
-# if len(f) == 3: file.write('%i,%i,%i' % fi )
else: file.write('%i,%i,%i,%i' % fi )
i=0
else:
@@ -1522,10 +1519,26 @@
file.write('\n\t\t')
i=0
if len(fi) == 3: file.write(',%i,%i,%i' % fi )
-# if len(f) == 3: file.write(',%i,%i,%i' % fi )
else: file.write(',%i,%i,%i,%i' % fi )
i+=1
+ # write loose edges as faces.
+ for ed in me.edges:
+ if ed.loose:
+ ed_val = ed.verts[:]
+ ed_val = ed_val[0], ed_val[-1] ^ -1
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list