[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27446] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27415 :27444
Brecht Van Lommel
brecht at blender.org
Fri Mar 12 14:52:38 CET 2010
Revision: 27446
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27446
Author: blendix
Date: 2010-03-12 14:52:38 +0100 (Fri, 12 Mar 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27415:27444
Modified Paths:
--------------
branches/render25/release/scripts/io/netrender/operators.py
branches/render25/release/scripts/io/netrender/utils.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/source/blender/blenkernel/BKE_node.h
branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
branches/render25/source/blender/blenkernel/intern/node.c
branches/render25/source/blender/blenlib/intern/threads.c
branches/render25/source/blender/editors/render/render_shading.c
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_outliner/outliner.c
branches/render25/source/blender/editors/space_outliner/outliner_intern.h
branches/render25/source/blender/editors/util/undo.c
branches/render25/source/blender/makesdna/DNA_scene_types.h
branches/render25/source/blender/makesrna/intern/rna_texture.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/render25/source/blender/render/intern/source/convertblender.c
branches/render25/source/blender/render/intern/source/result.c
branches/render25/source/blender/render/intern/source/texture_envmap.c
branches/render25/source/blender/windowmanager/intern/wm_event_system.c
Added Paths:
-----------
branches/render25/release/scripts/presets/render/TV_NTSC_16_colon_9.py
branches/render25/release/scripts/presets/render/TV_NTSC_4_colon_3.py
Removed Paths:
-------------
branches/render25/release/scripts/presets/render/D16.py
branches/render25/release/scripts/presets/render/D4.py
branches/render25/release/scripts/presets/render/SXGA.py
branches/render25/release/scripts/presets/render/TV_NTSC(D1)_16_colon_9.py
branches/render25/release/scripts/presets/render/TV_NTSC(D1)_4_colon_3.py
branches/render25/release/scripts/presets/render/TV_NTSC(DV)_16_colon_9.py
branches/render25/release/scripts/presets/render/TV_NTSC(DV)_4_colon_3.py
branches/render25/release/scripts/presets/render/TV_NTSC.py
branches/render25/release/scripts/presets/render/TV_PAL.py
branches/render25/release/scripts/presets/render/WSXGA+.py
branches/render25/release/scripts/presets/render/WSXGA.py
branches/render25/release/scripts/presets/render/XGA.py
Modified: branches/render25/release/scripts/io/netrender/operators.py
===================================================================
--- branches/render25/release/scripts/io/netrender/operators.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/io/netrender/operators.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -104,7 +104,7 @@
scene.network_render.job_id = client.clientSendJob(conn, scene, True)
conn.close()
- bpy.ops.screen.render('INVOKE_AREA', animation=True)
+ bpy.ops.render.render('INVOKE_AREA', animation=True)
return {'FINISHED'}
@@ -121,7 +121,7 @@
return True
def execute(self, context):
- bpy.ops.screen.render('INVOKE_AREA', animation=True)
+ bpy.ops.render.render('INVOKE_AREA', animation=True)
return {'FINISHED'}
Modified: branches/render25/release/scripts/io/netrender/utils.py
===================================================================
--- branches/render25/release/scripts/io/netrender/utils.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/io/netrender/utils.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -110,7 +110,7 @@
return None
try:
- conn = http.client.HTTPConnection(address, port)
+ conn = http.client.HTTPConnection(address, port, timeout = 5)
if conn:
if clientVerifyVersion(conn):
Deleted: branches/render25/release/scripts/presets/render/D16.py
===================================================================
--- branches/render25/release/scripts/presets/render/D16.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/presets/render/D16.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 2880
-bpy.context.scene.render.resolution_y = 2048
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 128
-bpy.context.scene.render.pixel_aspect_y = 135
-bpy.context.scene.render.fps = 24
-bpy.context.scene.render.fps_base = 1
Deleted: branches/render25/release/scripts/presets/render/D4.py
===================================================================
--- branches/render25/release/scripts/presets/render/D4.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/presets/render/D4.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 1440
-bpy.context.scene.render.resolution_y = 1024
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 128
-bpy.context.scene.render.pixel_aspect_y = 135
-bpy.context.scene.render.fps = 24
-bpy.context.scene.render.fps_base = 1
Deleted: branches/render25/release/scripts/presets/render/SXGA.py
===================================================================
--- branches/render25/release/scripts/presets/render/SXGA.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/presets/render/SXGA.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 1280
-bpy.context.scene.render.resolution_y = 1024
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 1
-bpy.context.scene.render.pixel_aspect_y = 1
-bpy.context.scene.render.fps = 24
-bpy.context.scene.render.fps_base = 1
Deleted: branches/render25/release/scripts/presets/render/TV_NTSC(D1)_16_colon_9.py
===================================================================
--- branches/render25/release/scripts/presets/render/TV_NTSC(D1)_16_colon_9.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/presets/render/TV_NTSC(D1)_16_colon_9.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 720
-bpy.context.scene.render.resolution_y = 486
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 6
-bpy.context.scene.render.pixel_aspect_y = 5
-bpy.context.scene.render.fps = 30
-bpy.context.scene.render.fps_base = 1.001
Deleted: branches/render25/release/scripts/presets/render/TV_NTSC(D1)_4_colon_3.py
===================================================================
--- branches/render25/release/scripts/presets/render/TV_NTSC(D1)_4_colon_3.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/presets/render/TV_NTSC(D1)_4_colon_3.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 720
-bpy.context.scene.render.resolution_y = 486
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 9
-bpy.context.scene.render.pixel_aspect_y = 10
-bpy.context.scene.render.fps = 30
-bpy.context.scene.render.fps_base = 1.001
Deleted: branches/render25/release/scripts/presets/render/TV_NTSC(DV)_16_colon_9.py
===================================================================
--- branches/render25/release/scripts/presets/render/TV_NTSC(DV)_16_colon_9.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/presets/render/TV_NTSC(DV)_16_colon_9.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 720
-bpy.context.scene.render.resolution_y = 480
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 32
-bpy.context.scene.render.pixel_aspect_y = 27
-bpy.context.scene.render.fps = 30
-bpy.context.scene.render.fps_base = 1.001
Deleted: branches/render25/release/scripts/presets/render/TV_NTSC(DV)_4_colon_3.py
===================================================================
--- branches/render25/release/scripts/presets/render/TV_NTSC(DV)_4_colon_3.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/presets/render/TV_NTSC(DV)_4_colon_3.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 720
-bpy.context.scene.render.resolution_y = 480
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 8
-bpy.context.scene.render.pixel_aspect_y = 9
-bpy.context.scene.render.fps = 30
-bpy.context.scene.render.fps_base = 1.001
Deleted: branches/render25/release/scripts/presets/render/TV_NTSC.py
===================================================================
--- branches/render25/release/scripts/presets/render/TV_NTSC.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/presets/render/TV_NTSC.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 720
-bpy.context.scene.render.resolution_y = 480
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 10
-bpy.context.scene.render.pixel_aspect_y = 11
-bpy.context.scene.render.fps = 30
-bpy.context.scene.render.fps_base = 1.001
Copied: branches/render25/release/scripts/presets/render/TV_NTSC_16_colon_9.py (from rev 27441, trunk/blender/release/scripts/presets/render/TV_NTSC_16_colon_9.py)
===================================================================
--- branches/render25/release/scripts/presets/render/TV_NTSC_16_colon_9.py (rev 0)
+++ branches/render25/release/scripts/presets/render/TV_NTSC_16_colon_9.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -0,0 +1,7 @@
+bpy.context.scene.render.resolution_x = 720
+bpy.context.scene.render.resolution_y = 480
+bpy.context.scene.render.resolution_percentage = 100
+bpy.context.scene.render.pixel_aspect_x = 40
+bpy.context.scene.render.pixel_aspect_y = 33
+bpy.context.scene.render.fps = 30
+bpy.context.scene.render.fps_base = 1.001
Copied: branches/render25/release/scripts/presets/render/TV_NTSC_4_colon_3.py (from rev 27441, trunk/blender/release/scripts/presets/render/TV_NTSC_4_colon_3.py)
===================================================================
--- branches/render25/release/scripts/presets/render/TV_NTSC_4_colon_3.py (rev 0)
+++ branches/render25/release/scripts/presets/render/TV_NTSC_4_colon_3.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -0,0 +1,7 @@
+bpy.context.scene.render.resolution_x = 720
+bpy.context.scene.render.resolution_y = 486
+bpy.context.scene.render.resolution_percentage = 100
+bpy.context.scene.render.pixel_aspect_x = 10
+bpy.context.scene.render.pixel_aspect_y = 11
+bpy.context.scene.render.fps = 30
+bpy.context.scene.render.fps_base = 1.001
Deleted: branches/render25/release/scripts/presets/render/TV_PAL.py
===================================================================
--- branches/render25/release/scripts/presets/render/TV_PAL.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/presets/render/TV_PAL.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -1,7 +0,0 @@
-bpy.context.scene.render.resolution_x = 720
-bpy.context.scene.render.resolution_y = 576
-bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 54
-bpy.context.scene.render.pixel_aspect_y = 51
-bpy.context.scene.render.fps = 25
-bpy.context.scene.render.fps_base = 1
Modified: branches/render25/release/scripts/presets/render/TV_PAL_16_colon_9.py
===================================================================
--- branches/render25/release/scripts/presets/render/TV_PAL_16_colon_9.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/presets/render/TV_PAL_16_colon_9.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -1,7 +1,7 @@
bpy.context.scene.render.resolution_x = 720
bpy.context.scene.render.resolution_y = 576
bpy.context.scene.render.resolution_percentage = 100
-bpy.context.scene.render.pixel_aspect_x = 64
-bpy.context.scene.render.pixel_aspect_y = 45
+bpy.context.scene.render.pixel_aspect_x = 16
+bpy.context.scene.render.pixel_aspect_y = 11
bpy.context.scene.render.fps = 25
bpy.context.scene.render.fps_base = 1
Modified: branches/render25/release/scripts/presets/render/TV_PAL_4_colon_3.py
===================================================================
--- branches/render25/release/scripts/presets/render/TV_PAL_4_colon_3.py 2010-03-12 13:50:57 UTC (rev 27445)
+++ branches/render25/release/scripts/presets/render/TV_PAL_4_colon_3.py 2010-03-12 13:52:38 UTC (rev 27446)
@@ -1,7 +1,7 @@
bpy.context.scene.render.resolution_x = 720
bpy.context.scene.render.resolution_y = 576
bpy.context.scene.render.resolution_percentage = 100
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list