[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42867] branches/ge_harmony: Merge with trunk up to r42866.
Mitchell Stokes
mogurijin at gmail.com
Sat Dec 24 23:12:11 CET 2011
Revision: 42867
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42867
Author: moguri
Date: 2011-12-24 22:12:00 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
Merge with trunk up to r42866.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42866
Modified Paths:
--------------
branches/ge_harmony/CMakeLists.txt
branches/ge_harmony/SConstruct
branches/ge_harmony/build_files/scons/config/win32-mingw-config.py
branches/ge_harmony/build_files/scons/config/win32-vc-config.py
branches/ge_harmony/doc/python_api/rst/change_log.rst
branches/ge_harmony/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/ge_harmony/intern/cycles/app/cycles_test.cpp
branches/ge_harmony/intern/cycles/app/cycles_xml.cpp
branches/ge_harmony/intern/cycles/blender/addon/engine.py
branches/ge_harmony/intern/cycles/blender/addon/ui.py
branches/ge_harmony/intern/cycles/blender/blender_camera.cpp
branches/ge_harmony/intern/cycles/blender/blender_mesh.cpp
branches/ge_harmony/intern/cycles/blender/blender_object.cpp
branches/ge_harmony/intern/cycles/blender/blender_python.cpp
branches/ge_harmony/intern/cycles/blender/blender_session.cpp
branches/ge_harmony/intern/cycles/blender/blender_session.h
branches/ge_harmony/intern/cycles/blender/blender_shader.cpp
branches/ge_harmony/intern/cycles/blender/blender_sync.cpp
branches/ge_harmony/intern/cycles/blender/blender_sync.h
branches/ge_harmony/intern/cycles/device/device.cpp
branches/ge_harmony/intern/cycles/device/device.h
branches/ge_harmony/intern/cycles/device/device_cpu.cpp
branches/ge_harmony/intern/cycles/device/device_cuda.cpp
branches/ge_harmony/intern/cycles/device/device_opencl.cpp
branches/ge_harmony/intern/cycles/kernel/CMakeLists.txt
branches/ge_harmony/intern/cycles/kernel/kernel.cl
branches/ge_harmony/intern/cycles/kernel/kernel.cpp
branches/ge_harmony/intern/cycles/kernel/kernel.cu
branches/ge_harmony/intern/cycles/kernel/kernel.h
branches/ge_harmony/intern/cycles/kernel/kernel_camera.h
branches/ge_harmony/intern/cycles/kernel/kernel_compat_opencl.h
branches/ge_harmony/intern/cycles/kernel/kernel_film.h
branches/ge_harmony/intern/cycles/kernel/kernel_optimized.cpp
branches/ge_harmony/intern/cycles/kernel/kernel_path.h
branches/ge_harmony/intern/cycles/kernel/kernel_random.h
branches/ge_harmony/intern/cycles/kernel/kernel_types.h
branches/ge_harmony/intern/cycles/render/buffers.cpp
branches/ge_harmony/intern/cycles/render/buffers.h
branches/ge_harmony/intern/cycles/render/camera.cpp
branches/ge_harmony/intern/cycles/render/graph.cpp
branches/ge_harmony/intern/cycles/render/graph.h
branches/ge_harmony/intern/cycles/render/integrator.cpp
branches/ge_harmony/intern/cycles/render/integrator.h
branches/ge_harmony/intern/cycles/render/nodes.cpp
branches/ge_harmony/intern/cycles/render/nodes.h
branches/ge_harmony/intern/cycles/render/session.cpp
branches/ge_harmony/intern/cycles/render/session.h
branches/ge_harmony/intern/cycles/render/tile.cpp
branches/ge_harmony/intern/cycles/render/tile.h
branches/ge_harmony/intern/cycles/util/util_math.h
branches/ge_harmony/intern/cycles/util/util_transform.h
branches/ge_harmony/intern/ghost/GHOST_C-api.h
branches/ge_harmony/intern/ghost/GHOST_ISystem.h
branches/ge_harmony/intern/ghost/GHOST_IWindow.h
branches/ge_harmony/intern/ghost/intern/GHOST_C-api.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_Debug.h
branches/ge_harmony/intern/ghost/intern/GHOST_DisplayManager.h
branches/ge_harmony/intern/ghost/intern/GHOST_EventDragnDrop.h
branches/ge_harmony/intern/ghost/intern/GHOST_EventKey.h
branches/ge_harmony/intern/ghost/intern/GHOST_EventNDOF.h
branches/ge_harmony/intern/ghost/intern/GHOST_EventTrackpad.h
branches/ge_harmony/intern/ghost/intern/GHOST_System.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_System.h
branches/ge_harmony/intern/ghost/intern/GHOST_SystemCocoa.h
branches/ge_harmony/intern/ghost/intern/GHOST_SystemX11.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_TimerTask.h
branches/ge_harmony/intern/ghost/intern/GHOST_Window.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_Window.h
branches/ge_harmony/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/ge_harmony/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/ge_harmony/intern/ghost/intern/GHOST_WindowWin32.h
branches/ge_harmony/intern/ghost/intern/GHOST_WindowX11.cpp
branches/ge_harmony/intern/guardedalloc/MEM_sys_types.h
branches/ge_harmony/intern/iksolver/intern/IK_Solver.cpp
branches/ge_harmony/intern/mikktspace/mikktspace.c
branches/ge_harmony/intern/opennl/intern/opennl.c
branches/ge_harmony/intern/opennl/superlu/get_perm_c.c
branches/ge_harmony/intern/opennl/superlu/scolumn_bmod.c
branches/ge_harmony/intern/opennl/superlu/strsv.c
branches/ge_harmony/intern/opennl/superlu/sutil.c
branches/ge_harmony/intern/opennl/superlu/util.h
branches/ge_harmony/release/scripts/modules/bpy_extras/io_utils.py
branches/ge_harmony/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/ge_harmony/release/scripts/modules/bpy_extras/view3d_utils.py
branches/ge_harmony/release/scripts/startup/bl_operators/clip.py
branches/ge_harmony/release/scripts/startup/bl_operators/sequencer.py
branches/ge_harmony/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/ge_harmony/release/scripts/startup/bl_operators/wm.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_game.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_particle.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_render.py
branches/ge_harmony/release/scripts/startup/bl_ui/properties_scene.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_logic.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_node.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_text.py
branches/ge_harmony/release/scripts/startup/bl_ui/space_view3d.py
branches/ge_harmony/source/blender/blenfont/BLF_translation.h
branches/ge_harmony/source/blender/blenfont/intern/blf_lang.c
branches/ge_harmony/source/blender/blenfont/intern/blf_translation.c
branches/ge_harmony/source/blender/blenkernel/BKE_customdata.h
branches/ge_harmony/source/blender/blenkernel/BKE_modifier.h
branches/ge_harmony/source/blender/blenkernel/BKE_node.h
branches/ge_harmony/source/blender/blenkernel/BKE_texture.h
branches/ge_harmony/source/blender/blenkernel/BKE_writeffmpeg.h
branches/ge_harmony/source/blender/blenkernel/depsgraph_private.h
branches/ge_harmony/source/blender/blenkernel/intern/DerivedMesh.c
branches/ge_harmony/source/blender/blenkernel/intern/cdderivedmesh.c
branches/ge_harmony/source/blender/blenkernel/intern/customdata.c
branches/ge_harmony/source/blender/blenkernel/intern/depsgraph.c
branches/ge_harmony/source/blender/blenkernel/intern/fcurve.c
branches/ge_harmony/source/blender/blenkernel/intern/idprop.c
branches/ge_harmony/source/blender/blenkernel/intern/image.c
branches/ge_harmony/source/blender/blenkernel/intern/ipo.c
branches/ge_harmony/source/blender/blenkernel/intern/mesh_validate.c
branches/ge_harmony/source/blender/blenkernel/intern/modifier.c
branches/ge_harmony/source/blender/blenkernel/intern/movieclip.c
branches/ge_harmony/source/blender/blenkernel/intern/node.c
branches/ge_harmony/source/blender/blenkernel/intern/object.c
branches/ge_harmony/source/blender/blenkernel/intern/subsurf_ccg.c
branches/ge_harmony/source/blender/blenkernel/intern/texture.c
branches/ge_harmony/source/blender/blenkernel/intern/tracking.c
branches/ge_harmony/source/blender/blenkernel/intern/unit.c
branches/ge_harmony/source/blender/blenkernel/intern/writeavi.c
branches/ge_harmony/source/blender/blenkernel/intern/writeffmpeg.c
branches/ge_harmony/source/blender/blenlib/BLI_dynstr.h
branches/ge_harmony/source/blender/blenlib/BLI_math_vector.h
branches/ge_harmony/source/blender/blenlib/BLI_utildefines.h
branches/ge_harmony/source/blender/blenlib/CMakeLists.txt
branches/ge_harmony/source/blender/blenlib/intern/BLI_dynstr.c
branches/ge_harmony/source/blender/blenlib/intern/bpath.c
branches/ge_harmony/source/blender/blenlib/intern/math_vector.c
branches/ge_harmony/source/blender/blenlib/intern/path_util.c
branches/ge_harmony/source/blender/blenloader/BLO_sys_types.h
branches/ge_harmony/source/blender/blenloader/CMakeLists.txt
branches/ge_harmony/source/blender/blenloader/SConscript
branches/ge_harmony/source/blender/blenloader/intern/readfile.c
branches/ge_harmony/source/blender/editors/animation/anim_channels_edit.c
branches/ge_harmony/source/blender/editors/animation/anim_filter.c
branches/ge_harmony/source/blender/editors/include/ED_mesh.h
branches/ge_harmony/source/blender/editors/include/ED_view3d.h
branches/ge_harmony/source/blender/editors/interface/interface.c
branches/ge_harmony/source/blender/editors/interface/interface_handlers.c
branches/ge_harmony/source/blender/editors/interface/interface_panel.c
branches/ge_harmony/source/blender/editors/interface/interface_regions.c
branches/ge_harmony/source/blender/editors/interface/interface_templates.c
branches/ge_harmony/source/blender/editors/interface/interface_widgets.c
branches/ge_harmony/source/blender/editors/interface/view2d.c
branches/ge_harmony/source/blender/editors/mesh/editface.c
branches/ge_harmony/source/blender/editors/mesh/editmesh.c
branches/ge_harmony/source/blender/editors/mesh/meshtools.c
branches/ge_harmony/source/blender/editors/object/object_edit.c
branches/ge_harmony/source/blender/editors/object/object_intern.h
branches/ge_harmony/source/blender/editors/object/object_modifier.c
branches/ge_harmony/source/blender/editors/object/object_ops.c
branches/ge_harmony/source/blender/editors/screen/screen_ops.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_image.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_ops.c
branches/ge_harmony/source/blender/editors/sculpt_paint/paint_stroke.c
branches/ge_harmony/source/blender/editors/sculpt_paint/sculpt.c
branches/ge_harmony/source/blender/editors/space_node/node_buttons.c
branches/ge_harmony/source/blender/editors/space_node/node_draw.c
branches/ge_harmony/source/blender/editors/space_node/node_edit.c
branches/ge_harmony/source/blender/editors/space_node/node_intern.h
branches/ge_harmony/source/blender/editors/space_node/node_ops.c
branches/ge_harmony/source/blender/editors/space_node/node_select.c
branches/ge_harmony/source/blender/editors/space_node/node_state.c
branches/ge_harmony/source/blender/editors/space_outliner/outliner_edit.c
branches/ge_harmony/source/blender/editors/space_outliner/outliner_select.c
branches/ge_harmony/source/blender/editors/space_text/text_ops.c
branches/ge_harmony/source/blender/editors/space_view3d/drawmesh.c
branches/ge_harmony/source/blender/editors/space_view3d/drawobject.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_header.c
branches/ge_harmony/source/blender/editors/space_view3d/view3d_view.c
branches/ge_harmony/source/blender/editors/transform/transform_conversions.c
branches/ge_harmony/source/blender/editors/transform/transform_snap.c
branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.c
branches/ge_harmony/source/blender/gpu/intern/gpu_codegen.h
branches/ge_harmony/source/blender/gpu/intern/gpu_draw.c
branches/ge_harmony/source/blender/gpu/intern/gpu_extensions.c
branches/ge_harmony/source/blender/gpu/intern/gpu_material.c
branches/ge_harmony/source/blender/imbuf/CMakeLists.txt
branches/ge_harmony/source/blender/imbuf/intern/thumbs.c
branches/ge_harmony/source/blender/makesdna/DNA_defs.h
branches/ge_harmony/source/blender/makesdna/DNA_genfile.h
branches/ge_harmony/source/blender/makesdna/DNA_mesh_types.h
branches/ge_harmony/source/blender/makesdna/DNA_object_types.h
branches/ge_harmony/source/blender/makesdna/DNA_scene_types.h
branches/ge_harmony/source/blender/makesdna/DNA_world_types.h
branches/ge_harmony/source/blender/makesdna/intern/dna_genfile.c
branches/ge_harmony/source/blender/makesdna/intern/makesdna.c
branches/ge_harmony/source/blender/makesrna/RNA_define.h
branches/ge_harmony/source/blender/makesrna/intern/makesrna.c
branches/ge_harmony/source/blender/makesrna/intern/rna_access.c
branches/ge_harmony/source/blender/makesrna/intern/rna_define.c
branches/ge_harmony/source/blender/makesrna/intern/rna_internal_types.h
branches/ge_harmony/source/blender/makesrna/intern/rna_material.c
branches/ge_harmony/source/blender/makesrna/intern/rna_mesh.c
branches/ge_harmony/source/blender/makesrna/intern/rna_movieclip.c
branches/ge_harmony/source/blender/makesrna/intern/rna_nodetree.c
branches/ge_harmony/source/blender/makesrna/intern/rna_object.c
branches/ge_harmony/source/blender/makesrna/intern/rna_object_api.c
branches/ge_harmony/source/blender/makesrna/intern/rna_rna.c
branches/ge_harmony/source/blender/makesrna/intern/rna_scene.c
branches/ge_harmony/source/blender/makesrna/intern/rna_space.c
branches/ge_harmony/source/blender/makesrna/intern/rna_userdef.c
branches/ge_harmony/source/blender/makesrna/intern/rna_world.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_decimate.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_edgesplit.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_multires.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_smooth.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_solidify.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_uvproject.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/ge_harmony/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/ge_harmony/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/ge_harmony/source/blender/nodes/shader/node_shader_util.c
branches/ge_harmony/source/blender/python/generic/bgl.c
branches/ge_harmony/source/blender/python/generic/bpy_internal_import.c
branches/ge_harmony/source/blender/python/generic/idprop_py_api.c
branches/ge_harmony/source/blender/python/generic/py_capi_utils.c
branches/ge_harmony/source/blender/python/intern/bpy_app_handlers.c
branches/ge_harmony/source/blender/python/intern/bpy_interface.c
branches/ge_harmony/source/blender/python/intern/bpy_props.c
branches/ge_harmony/source/blender/python/intern/bpy_rna.c
branches/ge_harmony/source/blender/python/intern/bpy_rna_anim.c
branches/ge_harmony/source/blender/python/intern/bpy_rna_array.c
branches/ge_harmony/source/blender/python/intern/bpy_rna_callback.c
branches/ge_harmony/source/blender/python/intern/gpu.c
branches/ge_harmony/source/blender/python/mathutils/mathutils.c
branches/ge_harmony/source/blender/python/mathutils/mathutils.h
branches/ge_harmony/source/blender/python/mathutils/mathutils_Color.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_Euler.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_Euler.h
branches/ge_harmony/source/blender/python/mathutils/mathutils_Matrix.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_Matrix.h
branches/ge_harmony/source/blender/python/mathutils/mathutils_Quaternion.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_Vector.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_Vector.h
branches/ge_harmony/source/blender/python/mathutils/mathutils_geometry.c
branches/ge_harmony/source/blender/python/mathutils/mathutils_noise.c
branches/ge_harmony/source/blender/quicktime/apple/qtkit_export.m
branches/ge_harmony/source/blender/quicktime/apple/quicktime_export.c
branches/ge_harmony/source/blender/quicktime/quicktime_export.h
branches/ge_harmony/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/ge_harmony/source/blender/render/intern/source/convertblender.c
branches/ge_harmony/source/blender/render/intern/source/external_engine.c
branches/ge_harmony/source/blender/render/intern/source/pixelshading.c
branches/ge_harmony/source/blender/render/intern/source/rayshade.c
branches/ge_harmony/source/blender/render/intern/source/render_texture.c
branches/ge_harmony/source/blender/render/intern/source/renderdatabase.c
branches/ge_harmony/source/blender/render/intern/source/shadeoutput.c
branches/ge_harmony/source/blender/render/intern/source/strand.c
branches/ge_harmony/source/blender/render/intern/source/volumetric.c
branches/ge_harmony/source/blender/windowmanager/intern/wm_event_system.c
branches/ge_harmony/source/creator/CMakeLists.txt
branches/ge_harmony/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
branches/ge_harmony/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/ge_harmony/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/ge_harmony/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/ge_harmony/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/ge_harmony/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/ge_harmony/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/ge_harmony/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/ge_harmony/source/gameengine/Ketsji/KX_PyMath.h
branches/ge_harmony/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/ge_harmony/source/tests/CMakeLists.txt
Added Paths:
-----------
branches/ge_harmony/source/blender/blenlib/BLI_md5.h
branches/ge_harmony/source/blender/blenlib/intern/md5.c
branches/ge_harmony/source/tests/bl_pyapi_mathutils.py
Removed Paths:
-------------
branches/ge_harmony/source/blender/imbuf/intern/md5.c
branches/ge_harmony/source/blender/imbuf/intern/md5.h
Property Changed:
----------------
branches/ge_harmony/
branches/ge_harmony/source/blender/editors/space_outliner/
Property changes on: branches/ge_harmony
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:42243-42699
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:42243-42866
Modified: branches/ge_harmony/CMakeLists.txt
===================================================================
--- branches/ge_harmony/CMakeLists.txt 2011-12-24 14:37:14 UTC (rev 42866)
+++ branches/ge_harmony/CMakeLists.txt 2011-12-24 22:12:00 UTC (rev 42867)
@@ -281,10 +281,12 @@
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
endif()
-if(WITH_CODEC_QUICKTIME AND MINGW)
- message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
- "because it is currently unsupported, remove this "
- "line if youre a developer who wants to add support.")
+if(MINGW)
+ if(WITH_CODEC_QUICKTIME)
+ message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
+ "because it is currently unsupported, remove this "
+ "line if youre a developer who wants to add support.")
+ endif()
endif()
if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
@@ -649,10 +651,6 @@
set(ICONV_LIBPATH ${ICONV}/lib)
endif()
- set(PNG "${LIBDIR}/png")
- set(PNG_INCLUDE_DIR "${PNG}/include")
- set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
-
set(JPEG "${LIBDIR}/jpeg")
set(JPEG_INCLUDE_DIR "${JPEG}/include")
set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
@@ -727,12 +725,12 @@
set(GETTEXT_LIBRARIES gnu_gettext)
endif()
- if(CMAKE_CL_64)
- set(PNG_LIBRARIES libpng)
- else()
- set(PNG_LIBRARIES libpng_st)
- endif()
+ set(PNG_LIBRARIES libpng)
set(JPEG_LIBRARIES libjpeg)
+
+ set(PNG "${LIBDIR}/png")
+ set(PNG_INCLUDE_DIR "${PNG}/include")
+ set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
if(CMAKE_CL_64)
@@ -913,6 +911,10 @@
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
set(GETTEXT_LIBRARIES intl)
endif()
+
+ set(PNG "${LIBDIR}/gcc/png")
+ set(PNG_INCLUDE_DIR "${PNG}/include")
+ set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
set(JPEG_LIBRARIES libjpeg)
set(PNG_LIBRARIES png)
Modified: branches/ge_harmony/SConstruct
===================================================================
--- branches/ge_harmony/SConstruct 2011-12-24 14:37:14 UTC (rev 42866)
+++ branches/ge_harmony/SConstruct 2011-12-24 22:12:00 UTC (rev 42867)
@@ -726,10 +726,6 @@
# For MinGW and linuxcross static linking will be used
dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
- #currently win64-vc doesn't appear to have libpng.dll
- if env['OURPLATFORM'] != 'win64-vc':
- dllsources += ['${BF_PNG_LIBPATH}/libpng.dll']
-
dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll']
# Used when linking to libtiff was dynamic
# keep it here until compilation on all platform would be ok
Modified: branches/ge_harmony/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/ge_harmony/build_files/scons/config/win32-mingw-config.py 2011-12-24 14:37:14 UTC (rev 42866)
+++ branches/ge_harmony/build_files/scons/config/win32-mingw-config.py 2011-12-24 22:12:00 UTC (rev 42867)
@@ -64,7 +64,7 @@
BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
WITH_BF_PNG = True
-BF_PNG = LIBDIR + '/png'
+BF_PNG = LIBDIR + '/gcc/png'
BF_PNG_INC = '${BF_PNG}/include'
BF_PNG_LIB = 'png'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
Modified: branches/ge_harmony/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/ge_harmony/build_files/scons/config/win32-vc-config.py 2011-12-24 14:37:14 UTC (rev 42866)
+++ branches/ge_harmony/build_files/scons/config/win32-vc-config.py 2011-12-24 22:12:00 UTC (rev 42867)
@@ -72,7 +72,7 @@
WITH_BF_PNG = True
BF_PNG = LIBDIR + '/png'
BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'libpng_st'
+BF_PNG_LIB = 'libpng'
BF_PNG_LIBPATH = '${BF_PNG}/lib'
WITH_BF_TIFF = True
Modified: branches/ge_harmony/doc/python_api/rst/change_log.rst
===================================================================
--- branches/ge_harmony/doc/python_api/rst/change_log.rst 2011-12-24 14:37:14 UTC (rev 42866)
+++ branches/ge_harmony/doc/python_api/rst/change_log.rst 2011-12-24 22:12:00 UTC (rev 42867)
@@ -1480,3 +1480,640 @@
* :class:`bpy.types.SceneGameData.restrict_animation_updates`
* :class:`bpy.types.SceneGameData.show_obstacle_simulation`
+
+2.60 to 2.61
+============
+
+bpy.types.BlendDataGroups
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataGroups.is_updated`
+
+bpy.types.BlendDataBrushes
+--------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataBrushes.is_updated`
+
+bpy.types.Theme
+---------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Theme.clip_editor`
+
+bpy.types.BlendData
+-------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendData.movieclips`
+
+bpy.types.BlendDataGreasePencils
+--------------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataGreasePencils.is_updated`
+
+bpy.types.BlendDataImages
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataImages.is_updated`
+
+bpy.types.CompositorNodes
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.CompositorNodes.clear`
+
+bpy.types.BlendDataScenes
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataScenes.is_updated`
+
+bpy.types.RenderEngine
+----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.RenderEngine.bl_use_shading_nodes`
+* :class:`bpy.types.RenderEngine.is_animation`
+* :class:`bpy.types.RenderEngine.is_preview`
+* :class:`bpy.types.RenderEngine.tag_redraw`
+* :class:`bpy.types.RenderEngine.tag_update`
+* :class:`bpy.types.RenderEngine.update`
+* :class:`bpy.types.RenderEngine.update_progress`
+* :class:`bpy.types.RenderEngine.view_draw`
+* :class:`bpy.types.RenderEngine.view_update`
+
+bpy.types.BackgroundImage
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BackgroundImage.clip`
+* :class:`bpy.types.BackgroundImage.clip_user`
+* :class:`bpy.types.BackgroundImage.show_background_image`
+* :class:`bpy.types.BackgroundImage.source`
+* :class:`bpy.types.BackgroundImage.use_camera_clip`
+
+bpy.types.BlendDataMetaBalls
+----------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataMetaBalls.is_updated`
+
+bpy.types.SpaceTimeline
+-----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.SpaceTimeline.cache_dynamicpaint`
+
+bpy.types.BlendDataMeshes
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataMeshes.is_updated`
+
+bpy.types.BlendDataNodeTrees
+----------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataNodeTrees.is_updated`
+
+bpy.types.RenderSettings
+------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.RenderSettings.image_settings`
+* :class:`bpy.types.RenderSettings.use_shading_nodes`
+
+Removed
+^^^^^^^
+
+* **cineon_black**
+* **cineon_gamma**
+* **cineon_white**
+* **color_mode**
+* **exr_codec**
+* **exr_preview**
+* **exr_zbuf**
+* **file_format**
+* **file_quality**
+* **jpeg2k_depth**
+* **jpeg2k_preset**
+* **jpeg2k_ycc**
+* **use_cineon_log**
+* **use_exr_half**
+* **use_tiff_16bit**
+
+bpy.types.Curve
+---------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Curve.cycles`
+
+bpy.types.RegionView3D
+----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.RegionView3D.view_camera_offset`
+* :class:`bpy.types.RegionView3D.view_camera_zoom`
+
+bpy.types.Scene
+---------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Scene.active_clip`
+* :class:`bpy.types.Scene.cycles`
+
+bpy.types.NodeLinks
+-------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.NodeLinks.clear`
+
+bpy.types.BlendDataLattices
+---------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataLattices.is_updated`
+
+bpy.types.BlendDataParticles
+----------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataParticles.is_updated`
+
+bpy.types.BlendDataWorlds
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataWorlds.is_updated`
+
+bpy.types.ObjectConstraints
+---------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.ObjectConstraints.clear`
+
+bpy.types.RenderLayers
+----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.RenderLayers.new`
+* :class:`bpy.types.RenderLayers.remove`
+
+bpy.types.Menu
+--------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Menu.bl_description`
+
+bpy.types.Lamp
+--------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Lamp.cycles`
+* :class:`bpy.types.Lamp.node_tree`
+* :class:`bpy.types.Lamp.use_nodes`
+
+bpy.types.CurveSplines
+----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.CurveSplines.clear`
+
+bpy.types.Screen
+----------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Screen.use_play_clip_editors`
+
+bpy.types.BlendDataActions
+--------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataActions.is_updated`
+
+bpy.types.BlendDataSounds
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataSounds.is_updated`
+
+bpy.types.Object
+----------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Object.cycles_visibility`
+* :class:`bpy.types.Object.slow_parent_offset`
+
+Removed
+^^^^^^^
+
+* **time_offset**
+* **use_time_offset_add_parent**
+* **use_time_offset_edit**
+* **use_time_offset_parent**
+* **use_time_offset_particle**
+
+bpy.types.ObjectModifiers
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.ObjectModifiers.clear`
+
+bpy.types.BlendDataMaterials
+----------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataMaterials.is_updated`
+
+bpy.types.MetaBallElements
+--------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.MetaBallElements.clear`
+
+bpy.types.NodeSocket
+--------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.NodeSocket.group_socket`
+* :class:`bpy.types.NodeSocket.show_expanded`
+
+bpy.types.Node
+--------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Node.show_texture`
+
+bpy.types.CompositorNodeOutputFile
+----------------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.CompositorNodeOutputFile.image_settings`
+
+Removed
+^^^^^^^
+
+* **exr_codec**
+* **image_type**
+* **quality**
+* **use_exr_half**
+
+bpy.types.BlendDataTexts
+------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataTexts.is_updated`
+
+bpy.types.ThemeView3D
+---------------------
+
+Added
+^^^^^
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list