[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30217] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30116 :30216
Brecht Van Lommel
brecht at blender.org
Mon Jul 12 12:43:55 CEST 2010
Revision: 30217
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30217
Author: blendix
Date: 2010-07-12 12:43:54 +0200 (Mon, 12 Jul 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30116:30216
Modified Paths:
--------------
branches/render25/CMakeLists.txt
branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/render25/intern/ghost/intern/GHOST_SystemX11.cpp
branches/render25/release/scripts/presets/cloth/cotton.py
branches/render25/release/scripts/presets/cloth/denim.py
branches/render25/release/scripts/presets/cloth/leather.py
branches/render25/release/scripts/presets/cloth/rubber.py
branches/render25/release/scripts/presets/cloth/silk.py
branches/render25/release/scripts/presets/ffmpeg/DV.py
branches/render25/release/scripts/presets/ffmpeg/DVD.py
branches/render25/release/scripts/presets/ffmpeg/SVCD.py
branches/render25/release/scripts/presets/ffmpeg/VCD.py
branches/render25/release/scripts/presets/ffmpeg/h264.py
branches/render25/release/scripts/presets/ffmpeg/theora.py
branches/render25/release/scripts/presets/ffmpeg/xvid.py
branches/render25/release/scripts/presets/render/DVCPRO_HD_1080p.py
branches/render25/release/scripts/presets/render/DVCPRO_HD_720p.py
branches/render25/release/scripts/presets/render/HDTV_1080p.py
branches/render25/release/scripts/presets/render/HDTV_720p.py
branches/render25/release/scripts/presets/render/HDV_1080p.py
branches/render25/release/scripts/presets/render/TV_NTSC_16_colon_9.py
branches/render25/release/scripts/presets/render/TV_NTSC_4_colon_3.py
branches/render25/release/scripts/presets/render/TV_PAL_16_colon_9.py
branches/render25/release/scripts/presets/render/TV_PAL_4_colon_3.py
branches/render25/release/scripts/presets/sss/apple.py
branches/render25/release/scripts/presets/sss/chicken.py
branches/render25/release/scripts/presets/sss/cream.py
branches/render25/release/scripts/presets/sss/ketchup.py
branches/render25/release/scripts/presets/sss/marble.py
branches/render25/release/scripts/presets/sss/potato.py
branches/render25/release/scripts/presets/sss/skim_milk.py
branches/render25/release/scripts/presets/sss/skin1.py
branches/render25/release/scripts/presets/sss/skin2.py
branches/render25/release/scripts/presets/sss/whole_milk.py
branches/render25/release/scripts/presets/sunsky/classic.py
branches/render25/release/scripts/presets/sunsky/desert.py
branches/render25/release/scripts/presets/sunsky/mountain.py
branches/render25/release/scripts/templates/operator.py
branches/render25/release/scripts/templates/operator_modal.py
branches/render25/release/scripts/templates/operator_modal_draw.py
branches/render25/release/scripts/templates/operator_modal_view3d.py
branches/render25/release/scripts/templates/operator_uv.py
branches/render25/release/scripts/ui/properties_particle.py
branches/render25/release/scripts/ui/space_image.py
branches/render25/release/scripts/ui/space_userpref.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenkernel/BKE_node.h
branches/render25/source/blender/blenkernel/BKE_sca.h
branches/render25/source/blender/blenkernel/intern/mball.c
branches/render25/source/blender/blenkernel/intern/particle_system.c
branches/render25/source/blender/blenkernel/intern/sca.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenlib/BLI_path_util.h
branches/render25/source/blender/blenlib/intern/path_util.c
branches/render25/source/blender/editors/mesh/meshtools.c
branches/render25/source/blender/editors/sound/sound_ops.c
branches/render25/source/blender/editors/space_logic/logic_ops.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/space_sequencer/sequencer_add.c
branches/render25/source/blender/editors/space_sequencer/sequencer_draw.c
branches/render25/source/blender/editors/space_time/space_time.c
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/makesrna/intern/makesrna.c
branches/render25/source/blender/makesrna/intern/rna_actuator.c
branches/render25/source/blender/makesrna/intern/rna_controller.c
branches/render25/source/blender/makesrna/intern/rna_internal.h
branches/render25/source/blender/makesrna/intern/rna_nodetree.c
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/makesrna/intern/rna_sensor.c
branches/render25/source/blender/makesrna/intern/rna_sequencer.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/render25/source/blender/python/doc/examples/mathutils.Vector.py
branches/render25/source/blender/python/doc/examples/mathutils.py
branches/render25/source/blender/python/intern/bpy_interface.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
branches/render25/source/creator/CMakeLists.txt
branches/render25/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/render25/source/gameengine/Ketsji/KX_BlenderMaterial.h
Added Paths:
-----------
branches/render25/source/blender/makesrna/intern/rna_actuator_api.c
branches/render25/source/blender/makesrna/intern/rna_controller_api.c
branches/render25/source/blender/makesrna/intern/rna_sensor_api.c
Modified: branches/render25/CMakeLists.txt
===================================================================
--- branches/render25/CMakeLists.txt 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/CMakeLists.txt 2010-07-12 10:43:54 UTC (rev 30217)
@@ -485,7 +485,7 @@
SET(PCRE_LIB pcre)
ENDIF(WITH_OPENCOLLADA)
- # TODO: IF(WITH_LCMS)
+ # TODO: IF(WITH_LCMS)
IF(WITH_FFMPEG)
SET(FFMPEG ${LIBDIR}/ffmpeg)
@@ -534,7 +534,7 @@
ELSE(MSVC) # MINGW
SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
- SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char -fno-strict-aliasing -mwindows" CACHE STRING "Mingw C++ flags ")
+ SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C++ flags ")
SET(CMAKE_C_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags ")
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C++ flags ")
@@ -561,7 +561,7 @@
SET(GETTEXT_LIB intl)
ENDIF(WITH_INTERNATIONAL)
- SET(JPEG_LIBRARY jpeg)
+ SET(JPEG_LIBRARY libjpeg)
SET(PNG_LIBRARIES png)
SET(ZLIB ${LIBDIR}/zlib)
@@ -607,7 +607,7 @@
IF(WITH_OPENEXR)
SET(OPENEXR ${LIBDIR}/gcc/openexr)
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
- SET(OPENEXR_LIB Half IlmImf Iex)
+ SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
ENDIF(WITH_OPENEXR)
Modified: branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-07-12 10:43:54 UTC (rev 30217)
@@ -813,7 +813,11 @@
GHOST_WindowCocoa* window = (GHOST_WindowCocoa*)m_windowManager->getActiveWindow();
if (!window) return GHOST_kFailure;
+ //Cursor and mouse dissociation placed here not to interfere with continuous grab
+ // (in cont. grab setMouseCursorPosition is directly called)
+ CGAssociateMouseAndMouseCursorPosition(false);
setMouseCursorPosition(x, y);
+ CGAssociateMouseAndMouseCursorPosition(true);
//Force mouse move event (not pushed by Cocoa)
window->screenToClient(x, y, wx, wy);
Modified: branches/render25/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemX11.cpp 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/intern/ghost/intern/GHOST_SystemX11.cpp 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1461,7 +1461,7 @@
const GHOST_TUns8* GHOST_SystemX11::getSystemDir() const
{
- return (GHOST_TUns8*)"/usr/share/";
+ return (GHOST_TUns8*)"/usr/share";
}
const GHOST_TUns8* GHOST_SystemX11::getUserDir() const
@@ -1477,4 +1477,5 @@
const GHOST_TUns8* GHOST_SystemX11::getBinaryDir() const
{
return NULL;
-}
\ No newline at end of file
+}
+
Modified: branches/render25/release/scripts/presets/cloth/cotton.py
===================================================================
--- branches/render25/release/scripts/presets/cloth/cotton.py 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/release/scripts/presets/cloth/cotton.py 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1,3 +1,4 @@
+import bpy
bpy.context.cloth.settings.quality = 5
bpy.context.cloth.settings.mass = 0.300
bpy.context.cloth.settings.structural_stiffness = 15.000
Modified: branches/render25/release/scripts/presets/cloth/denim.py
===================================================================
--- branches/render25/release/scripts/presets/cloth/denim.py 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/release/scripts/presets/cloth/denim.py 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1,3 +1,4 @@
+import bpy
bpy.context.cloth.settings.quality = 12
bpy.context.cloth.settings.mass = 1
bpy.context.cloth.settings.structural_stiffness = 40
Modified: branches/render25/release/scripts/presets/cloth/leather.py
===================================================================
--- branches/render25/release/scripts/presets/cloth/leather.py 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/release/scripts/presets/cloth/leather.py 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1,3 +1,4 @@
+import bpy
bpy.context.cloth.settings.quality = 15
bpy.context.cloth.settings.mass = 0.4
bpy.context.cloth.settings.structural_stiffness = 80
Modified: branches/render25/release/scripts/presets/cloth/rubber.py
===================================================================
--- branches/render25/release/scripts/presets/cloth/rubber.py 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/release/scripts/presets/cloth/rubber.py 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1,3 +1,4 @@
+import bpy
bpy.context.active_object.modifiers['Cloth'].settings.quality = 7
bpy.context.active_object.modifiers['Cloth'].settings.mass = 3
bpy.context.active_object.modifiers['Cloth'].settings.structural_stiffness = 15
Modified: branches/render25/release/scripts/presets/cloth/silk.py
===================================================================
--- branches/render25/release/scripts/presets/cloth/silk.py 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/release/scripts/presets/cloth/silk.py 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1,3 +1,4 @@
+import bpy
bpy.context.cloth.settings.quality = 5
bpy.context.cloth.settings.mass = 0.150
bpy.context.cloth.settings.structural_stiffness = 5
Modified: branches/render25/release/scripts/presets/ffmpeg/DV.py
===================================================================
--- branches/render25/release/scripts/presets/ffmpeg/DV.py 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/release/scripts/presets/ffmpeg/DV.py 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1,3 +1,4 @@
+import bpy
is_ntsc = (bpy.context.scene.render.fps != 25)
bpy.context.scene.render.ffmpeg_format = "DV"
Modified: branches/render25/release/scripts/presets/ffmpeg/DVD.py
===================================================================
--- branches/render25/release/scripts/presets/ffmpeg/DVD.py 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/release/scripts/presets/ffmpeg/DVD.py 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1,3 +1,4 @@
+import bpy
is_ntsc = (bpy.context.scene.render.fps != 25)
bpy.context.scene.render.ffmpeg_format = "MPEG2"
@@ -15,4 +16,4 @@
bpy.context.scene.render.ffmpeg_minrate = 0
bpy.context.scene.render.ffmpeg_buffersize = 224*8
bpy.context.scene.render.ffmpeg_packetsize = 2048
-bpy.context.scene.render.ffmpeg_muxrate = 10080000
\ No newline at end of file
+bpy.context.scene.render.ffmpeg_muxrate = 10080000
Modified: branches/render25/release/scripts/presets/ffmpeg/SVCD.py
===================================================================
--- branches/render25/release/scripts/presets/ffmpeg/SVCD.py 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/release/scripts/presets/ffmpeg/SVCD.py 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1,3 +1,4 @@
+import bpy
is_ntsc = (bpy.context.scene.render.fps != 25)
bpy.context.scene.render.ffmpeg_format = "MPEG2"
@@ -15,4 +16,4 @@
bpy.context.scene.render.ffmpeg_minrate = 0
bpy.context.scene.render.ffmpeg_buffersize = 224*8
bpy.context.scene.render.ffmpeg_packetsize = 2324
-bpy.context.scene.render.ffmpeg_muxrate = 0
\ No newline at end of file
+bpy.context.scene.render.ffmpeg_muxrate = 0
Modified: branches/render25/release/scripts/presets/ffmpeg/VCD.py
===================================================================
--- branches/render25/release/scripts/presets/ffmpeg/VCD.py 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/release/scripts/presets/ffmpeg/VCD.py 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1,3 +1,4 @@
+import bpy
is_ntsc = (bpy.context.scene.render.fps != 25)
bpy.context.scene.render.ffmpeg_format = "MPEG1"
@@ -15,4 +16,4 @@
bpy.context.scene.render.ffmpeg_minrate = 1150
bpy.context.scene.render.ffmpeg_buffersize = 40*8
bpy.context.scene.render.ffmpeg_packetsize = 2324
-bpy.context.scene.render.ffmpeg_muxrate = 2352 * 75 * 8
\ No newline at end of file
+bpy.context.scene.render.ffmpeg_muxrate = 2352 * 75 * 8
Modified: branches/render25/release/scripts/presets/ffmpeg/h264.py
===================================================================
--- branches/render25/release/scripts/presets/ffmpeg/h264.py 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/release/scripts/presets/ffmpeg/h264.py 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1,3 +1,4 @@
+import bpy
is_ntsc = (bpy.context.scene.render.fps != 25)
bpy.context.scene.render.ffmpeg_format = "H264"
@@ -13,4 +14,4 @@
bpy.context.scene.render.ffmpeg_minrate = 0
bpy.context.scene.render.ffmpeg_buffersize = 224*8
bpy.context.scene.render.ffmpeg_packetsize = 2048
-bpy.context.scene.render.ffmpeg_muxrate = 10080000
\ No newline at end of file
+bpy.context.scene.render.ffmpeg_muxrate = 10080000
Modified: branches/render25/release/scripts/presets/ffmpeg/theora.py
===================================================================
--- branches/render25/release/scripts/presets/ffmpeg/theora.py 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/release/scripts/presets/ffmpeg/theora.py 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1,3 +1,4 @@
+import bpy
is_ntsc = (bpy.context.scene.render.fps != 25)
bpy.context.scene.render.ffmpeg_format = "OGG"
@@ -13,4 +14,4 @@
bpy.context.scene.render.ffmpeg_minrate = 0
bpy.context.scene.render.ffmpeg_buffersize = 224*8
bpy.context.scene.render.ffmpeg_packetsize = 2048
-bpy.context.scene.render.ffmpeg_muxrate = 10080000
\ No newline at end of file
+bpy.context.scene.render.ffmpeg_muxrate = 10080000
Modified: branches/render25/release/scripts/presets/ffmpeg/xvid.py
===================================================================
--- branches/render25/release/scripts/presets/ffmpeg/xvid.py 2010-07-12 09:55:41 UTC (rev 30216)
+++ branches/render25/release/scripts/presets/ffmpeg/xvid.py 2010-07-12 10:43:54 UTC (rev 30217)
@@ -1,3 +1,4 @@
+import bpy
is_ntsc = (bpy.context.scene.render.fps != 25)
bpy.context.scene.render.ffmpeg_format = "AVI"
@@ -13,4 +14,4 @@
bpy.context.scene.render.ffmpeg_minrate = 0
bpy.context.scene.render.ffmpeg_buffersize = 224*8
bpy.context.scene.render.ffmpeg_packetsize = 2048
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list