[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27104] trunk/blender: scene.render_data - > scene.render
Campbell Barton
ideasman42 at gmail.com
Tue Feb 23 13:48:35 CET 2010
Revision: 27104
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27104
Author: campbellbarton
Date: 2010-02-23 13:48:35 +0100 (Tue, 23 Feb 2010)
Log Message:
-----------
scene.render_data -> scene.render
bpy.types.SceneRenderData -> bpy.types.RenderSettings
better do these changes before there are too many scripts out.
Modified Paths:
--------------
trunk/blender/release/scripts/io/engine_render_pov.py
trunk/blender/release/scripts/io/export_fbx.py
trunk/blender/release/scripts/io/export_x3d.py
trunk/blender/release/scripts/io/netrender/client.py
trunk/blender/release/scripts/io/netrender/master.py
trunk/blender/release/scripts/io/netrender/operators.py
trunk/blender/release/scripts/io/netrender/ui.py
trunk/blender/release/scripts/io/netrender/utils.py
trunk/blender/release/scripts/op/presets.py
trunk/blender/release/scripts/op/screen_play_rendered_anim.py
trunk/blender/release/scripts/presets/render/HDTV_1080p.py
trunk/blender/release/scripts/presets/render/HDTV_720p.py
trunk/blender/release/scripts/presets/render/TV_NTSC.py
trunk/blender/release/scripts/presets/render/TV_PAL.py
trunk/blender/release/scripts/presets/render/TV_PAL_16_colon_9.py
trunk/blender/release/scripts/ui/properties_game.py
trunk/blender/release/scripts/ui/properties_material.py
trunk/blender/release/scripts/ui/properties_physics_cloth.py
trunk/blender/release/scripts/ui/properties_physics_field.py
trunk/blender/release/scripts/ui/properties_physics_fluid.py
trunk/blender/release/scripts/ui/properties_physics_smoke.py
trunk/blender/release/scripts/ui/properties_physics_softbody.py
trunk/blender/release/scripts/ui/properties_render.py
trunk/blender/release/scripts/ui/properties_scene.py
trunk/blender/release/scripts/ui/properties_world.py
trunk/blender/release/scripts/ui/space_image.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_node.py
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/release/scripts/io/engine_render_pov.py
===================================================================
--- trunk/blender/release/scripts/io/engine_render_pov.py 2010-02-23 12:22:22 UTC (rev 27103)
+++ trunk/blender/release/scripts/io/engine_render_pov.py 2010-02-23 12:48:35 UTC (rev 27104)
@@ -41,7 +41,7 @@
if not scene:
scene = bpy.data.scenes[0]
- render = scene.render_data
+ render = scene.render
world = scene.world
def uniqueName(name, nameSeq):
@@ -602,7 +602,7 @@
def write_pov_ini(filename_ini, filename_pov, filename_image):
scene = bpy.data.scenes[0]
- render = scene.render_data
+ render = scene.render
x = int(render.resolution_x * render.resolution_percentage * 0.01)
y = int(render.resolution_y * render.resolution_percentage * 0.01)
@@ -785,7 +785,7 @@
self.update_stats("", "POVRAY: Parsing File")
self._render()
- r = scene.render_data
+ r = scene.render
# compute resolution
x = int(r.resolution_x * r.resolution_percentage * 0.01)
@@ -889,7 +889,7 @@
# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
def poll(self, context):
- rd = context.scene.render_data
+ rd = context.scene.render
return (rd.use_game_engine == False) and (rd.engine in self.COMPAT_ENGINES)
@@ -906,7 +906,7 @@
layout = self.layout
scene = context.scene
- rd = scene.render_data
+ rd = scene.render
layout.active = scene.pov_radio_enable
Modified: trunk/blender/release/scripts/io/export_fbx.py
===================================================================
--- trunk/blender/release/scripts/io/export_fbx.py 2010-02-23 12:22:22 UTC (rev 27103)
+++ trunk/blender/release/scripts/io/export_fbx.py 2010-02-23 12:48:35 UTC (rev 27104)
@@ -412,13 +412,13 @@
# XXX don't know what to do with this, probably do the same? (Arystan)
if BATCH_GROUP: #group
# group, so objects update properly, add a dummy scene.
- sce = bpy.data.scenes.new()
- sce.Layers = (1<<20) -1
- bpy.data.scenes.active = sce
+ scene = bpy.data.scenes.new()
+ scene.Layers = (1<<20) -1
+ bpy.data.scenes.active = scene
for ob_base in data.objects:
- sce.objects.link(ob_base)
+ scene.objects.link(ob_base)
- sce.update(1)
+ scene.update(1)
# TODO - BUMMER! Armatures not in the group wont animate the mesh
@@ -450,8 +450,8 @@
if BATCH_GROUP:
# remove temp group scene
- bpy.data.remove_scene(sce)
-# bpy.data.scenes.unlink(sce)
+ bpy.data.remove_scene(scene)
+# bpy.data.scenes.unlink(scene)
bpy.data.scenes.active = orig_sce
@@ -618,9 +618,9 @@
except:
return False
- sce = context.scene
-# sce = bpy.data.scenes.active
- world = sce.world
+ scene = context.scene
+# scene = bpy.data.scenes.active
+ world = scene.world
# ---------------------------- Write the header first
@@ -983,10 +983,10 @@
'''
Write a blender camera
'''
- render = sce.render_data
+ render = scene.render
width = render.resolution_x
height = render.resolution_y
-# render = sce.render
+# render = scene.render
# width = render.sizeX
# height = render.sizeY
aspect = float(width)/height
@@ -2016,8 +2016,8 @@
# if EXP_OBS_SELECTED is false, use sceens objects
if not batch_objects:
if EXP_OBS_SELECTED: tmp_objects = context.selected_objects
-# if EXP_OBS_SELECTED: tmp_objects = sce.objects.context
- else: tmp_objects = sce.objects
+# if EXP_OBS_SELECTED: tmp_objects = scene.objects.context
+ else: tmp_objects = scene.objects
else:
tmp_objects = batch_objects
@@ -2039,7 +2039,7 @@
# ob_base.makeDisplayList()
# This causes the makeDisplayList command to effect the mesh
- sce.set_frame(sce.current_frame)
+ scene.set_frame(scene.current_frame)
# Blender.Set('curframe', Blender.Get('curframe'))
@@ -2214,7 +2214,7 @@
ob_base.make_display_list()
# ob_base.makeDisplayList()
# This causes the makeDisplayList command to effect the mesh
- sce.set_frame(sce.current_frame)
+ scene.set_frame(scene.current_frame)
# Blender.Set('curframe', Blender.Get('curframe'))
del tmp_ob_type, tmp_objects
@@ -2689,8 +2689,8 @@
# Needed for scene footer as well as animation
- render = sce.render_data
-# render = sce.render
+ render = scene.render
+# render = scene.render
# from the FBX sdk
#define KTIME_ONE_SECOND KTime (K_LONGLONG(46186158000))
@@ -2699,9 +2699,9 @@
return int(0.5 + ((t/fps) * 46186158000))
fps = float(render.fps)
- start = sce.start_frame
+ start = scene.start_frame
# start = render.sFrame
- end = sce.end_frame
+ end = scene.end_frame
# end = render.eFrame
if end < start: start, end = end, start
if start==end: ANIM_ENABLE = False
@@ -2711,7 +2711,7 @@
if ANIM_ENABLE and [tmp for tmp in ob_anim_lists if tmp]:
- frame_orig = sce.current_frame
+ frame_orig = scene.current_frame
# frame_orig = Blender.Get('curframe')
if ANIM_OPTIMIZE:
@@ -2812,7 +2812,7 @@
if blenAction in my_bone.blenActionList:
ob.action = blenAction
# print '\t\tSetting Action!', blenAction
- # sce.update(1)
+ # scene.update(1)
file.write('\n\t\tFileName: "Default_Take.tak"') # ??? - not sure why this is needed
file.write('\n\t\tLocalTime: %i,%i' % (fbx_time(act_start-1), fbx_time(act_end-1))) # ??? - not sure why this is needed
@@ -2832,7 +2832,7 @@
'''
i = act_start
while i <= act_end:
- sce.set_frame(i)
+ scene.set_frame(i)
# Blender.Set('curframe', i)
for ob_generic in ob_anim_lists:
for my_ob in ob_generic:
@@ -2971,7 +2971,7 @@
file.write('\n}')
- sce.set_frame(frame_orig)
+ scene.set_frame(frame_orig)
# Blender.Set('curframe', frame_orig)
else:
Modified: trunk/blender/release/scripts/io/export_x3d.py
===================================================================
--- trunk/blender/release/scripts/io/export_x3d.py 2010-02-23 12:22:22 UTC (rev 27103)
+++ trunk/blender/release/scripts/io/export_x3d.py 2010-02-23 12:48:35 UTC (rev 27104)
@@ -228,7 +228,7 @@
'''
def writeViewpoint(self, ob, mat, scene):
- context = scene.render_data
+ context = scene.render
# context = scene.render
ratio = float(context.resolution_x)/float(context.resolution_y)
# ratio = float(context.imageSizeY())/float(context.imageSizeX())
Modified: trunk/blender/release/scripts/io/netrender/client.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/client.py 2010-02-23 12:22:22 UTC (rev 27103)
+++ trunk/blender/release/scripts/io/netrender/client.py 2010-02-23 12:48:35 UTC (rev 27104)
@@ -201,7 +201,7 @@
def render_slave(self, scene):
- slave.render_slave(self, scene.network_render, scene.render_data.threads)
+ slave.render_slave(self, scene.network_render, scene.render.threads)
def render_client(self, scene):
netsettings = scene.network_render
@@ -250,7 +250,7 @@
conn.close()
return
- r = scene.render_data
+ r = scene.render
x= int(r.resolution_x*r.resolution_percentage*0.01)
y= int(r.resolution_y*r.resolution_percentage*0.01)
Modified: trunk/blender/release/scripts/io/netrender/master.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/master.py 2010-02-23 12:22:22 UTC (rev 27103)
+++ trunk/blender/release/scripts/io/netrender/master.py 2010-02-23 12:48:35 UTC (rev 27104)
@@ -80,7 +80,7 @@
def initInfo(self):
if not self.resolution:
- self.resolution = tuple(getFileInfo(self.files[0].filepath, ["bpy.context.scene.render_data.resolution_x", "bpy.context.scene.render_data.resolution_y", "bpy.context.scene.render_data.resolution_percentage"]))
+ self.resolution = tuple(getFileInfo(self.files[0].filepath, ["bpy.context.scene.render.resolution_x", "bpy.context.scene.render.resolution_y", "bpy.context.scene.render.resolution_percentage"]))
def save(self):
if self.save_path:
Modified: trunk/blender/release/scripts/io/netrender/operators.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/operators.py 2010-02-23 12:22:22 UTC (rev 27103)
+++ trunk/blender/release/scripts/io/netrender/operators.py 2010-02-23 12:48:35 UTC (rev 27104)
@@ -372,7 +372,7 @@
def execute(self, context):
netsettings = context.scene.network_render
- rd = context.scene.render_data
+ rd = context.scene.render
conn = clientConnection(netsettings.server_address, netsettings.server_port, self.report)
Modified: trunk/blender/release/scripts/io/netrender/ui.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/ui.py 2010-02-23 12:22:22 UTC (rev 27103)
+++ trunk/blender/release/scripts/io/netrender/ui.py 2010-02-23 12:48:35 UTC (rev 27104)
@@ -83,7 +83,7 @@
# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
def poll(self, context):
- rd = context.scene.render_data
+ rd = context.scene.render
return (rd.use_game_engine==False) and (rd.engine in self.COMPAT_ENGINES)
# Setting panel, use in the scene for now.
@@ -136,7 +136,7 @@
layout = self.layout
scene = context.scene
- rd = scene.render_data
+ rd = scene.render
netsettings = scene.network_render
layout.prop(netsettings, "slave_clear")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list