diff options
31 files changed, 188 insertions, 188 deletions
diff --git a/release/scripts/io/engine_render_pov.py b/release/scripts/io/engine_render_pov.py index 1be08fc82d4..338676968cd 100644 --- a/release/scripts/io/engine_render_pov.py +++ b/release/scripts/io/engine_render_pov.py @@ -41,7 +41,7 @@ def write_pov(filename, scene=None, info_callback=None): 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(filename, scene=None, info_callback=None): 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 @@ class PovrayRender(bpy.types.RenderEngine): 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 @@ class RenderButtonsPanel(bpy.types.Panel): # 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 @@ class RENDER_PT_povray_radiosity(RenderButtonsPanel): layout = self.layout scene = context.scene - rd = scene.render_data + rd = scene.render layout.active = scene.pov_radio_enable diff --git a/release/scripts/io/export_fbx.py b/release/scripts/io/export_fbx.py index 117b113a399..35ea4153e5c 100644 --- a/release/scripts/io/export_fbx.py +++ b/release/scripts/io/export_fbx.py @@ -412,13 +412,13 @@ def write(filename, batch_objects = None, \ # 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 @@ def write(filename, batch_objects = None, \ 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 @@ def write(filename, batch_objects = None, \ 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 @@ def write(filename, batch_objects = None, \ ''' 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 @@ def write(filename, batch_objects = None, \ # 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 @@ def write(filename, batch_objects = None, \ # 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 @@ def write(filename, batch_objects = None, \ 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 @@ Connections: {''') # 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 @@ Connections: {''') 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 @@ Connections: {''') 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 @@ Takes: {''') 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 @@ Takes: {''') ''' 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 @@ Takes: {''') file.write('\n}') - sce.set_frame(frame_orig) + scene.set_frame(frame_orig) # Blender.Set('curframe', frame_orig) else: diff --git a/release/scripts/io/export_x3d.py b/release/scripts/io/export_x3d.py index 68e7ebce361..61a2e8220e2 100644 --- a/release/scripts/io/export_x3d.py +++ b/release/scripts/io/export_x3d.py @@ -228,7 +228,7 @@ class x3d_class: ''' 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()) diff --git a/release/scripts/io/netrender/client.py b/release/scripts/io/netrender/client.py index 26f6b6809a2..8ca573fa686 100644 --- a/release/scripts/io/netrender/client.py +++ b/release/scripts/io/netrender/client.py @@ -201,7 +201,7 @@ class NetworkRenderEngine(bpy.types.RenderEngine): 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 @@ class NetworkRenderEngine(bpy.types.RenderEngine): 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) diff --git a/release/scripts/io/netrender/master.py b/release/scripts/io/netrender/master.py index 4c9116982b5..fed324e7258 100644 --- a/release/scripts/io/netrender/master.py +++ b/release/scripts/io/netrender/master.py @@ -80,7 +80,7 @@ class MRenderJob(netrender.model.RenderJob): 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: diff --git a/release/scripts/io/netrender/operators.py b/release/scripts/io/netrender/operators.py index f5e665f9947..f667be68c84 100644 --- a/release/scripts/io/netrender/operators.py +++ b/release/scripts/io/netrender/operators.py @@ -372,7 +372,7 @@ class netclientdownload(bpy.types.Operator): 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) diff --git a/release/scripts/io/netrender/ui.py b/release/scripts/io/netrender/ui.py index 53f4e6413d3..ba14d7e4f42 100644 --- a/release/scripts/io/netrender/ui.py +++ b/release/scripts/io/netrender/ui.py @@ -83,7 +83,7 @@ class RenderButtonsPanel(bpy.types.Panel): # 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 @@ class RENDER_PT_network_slave_settings(RenderButtonsPanel): layout = self.layout scene = context.scene - rd = scene.render_data + rd = scene.render netsettings = scene.network_render layout.prop(netsettings, "slave_clear") diff --git a/release/scripts/io/netrender/utils.py b/release/scripts/io/netrender/utils.py index ac4a9307f81..1215da3e9f8 100644 --- a/release/scripts/io/netrender/utils.py +++ b/release/scripts/io/netrender/utils.py @@ -197,12 +197,12 @@ def thumbnail(filename): return thumbname if bpy: - sce = bpy.data.scenes[0] - sce.render_data.file_format = "JPEG" - sce.render_data.quality = 90 + scene = bpy.data.scenes[0] # FIXME, this is dodgy! + scene.render.file_format = "JPEG" + scene.render.quality = 90 bpy.ops.image.open(path = filename) img = bpy.data.images[imagename] - img.save(thumbname, scene = sce) + img.save(thumbname, scene=scene) try: process = subprocess.Popen(["convert", thumbname, "-resize", "300x300", thumbname]) diff --git a/release/scripts/op/presets.py b/release/scripts/op/presets.py index 438660ecc19..1a8e57f7c32 100644 --- a/release/scripts/op/presets.py +++ b/release/scripts/op/presets.py @@ -75,16 +75,16 @@ class AddPresetRender(AddPresetBase): name = AddPresetBase.name preset_values = [ - "bpy.context.scene.render_data.resolution_x", - "bpy.context.scene.render_data.resolution_y", - "bpy.context.scene.render_data.pixel_aspect_x", - "bpy.context.scene.render_data.pixel_aspect_y", - "bpy.context.scene.render_data.fps", - "bpy.context.scene.render_data.fps_base", - "bpy.context.scene.render_data.resolution_percentage", - "bpy.context.scene.render_data.fields", - "bpy.context.scene.render_data.field_order", - "bpy.context.scene.render_data.fields_still", + "bpy.context.scene.render.resolution_x", + "bpy.context.scene.render.resolution_y", + "bpy.context.scene.render.pixel_aspect_x", + "bpy.context.scene.render.pixel_aspect_y", + "bpy.context.scene.render.fps", + "bpy.context.scene.render.fps_base", + "bpy.context.scene.render.resolution_percentage", + "bpy.context.scene.render.fields", + "bpy.context.scene.render.field_order", + "bpy.context.scene.render.fields_still", ] preset_subdir = "render" diff --git a/release/scripts/op/screen_play_rendered_anim.py b/release/scripts/op/screen_play_rendered_anim.py index 63211eb26f3..53742ed41b1 100644 --- a/release/scripts/op/screen_play_rendered_anim.py +++ b/release/scripts/op/screen_play_rendered_anim.py @@ -68,8 +68,8 @@ class PlayRenderedAnim(bpy.types.Operator): bl_undo = False def execute(self, context): - sce = context.scene - rd = sce.render_data + scene = context.scene + rd = scene.render prefs = context.user_preferences preset = prefs.filepaths.animation_player_preset @@ -86,7 +86,7 @@ class PlayRenderedAnim(bpy.types.Operator): file = ''.join([(c if file_b[i] == c else "#") for i, c in enumerate(file_a)]) else: # works for movies and images - file = rd.frame_path(frame=sce.start_frame) + file = rd.frame_path(frame=scene.start_frame) cmd = [player_path] # extra options, fps controls etc. @@ -97,7 +97,7 @@ class PlayRenderedAnim(bpy.types.Operator): opts = [file, "-playback_speed", str(rd.fps)] cmd.extend(opts) elif preset == 'FRAMECYCLER': - opts = [file, "%d-%d" % (sce.start_frame, sce.end_frame)] + opts = [file, "%d-%d" % (scene.start_frame, scene.end_frame)] cmd.extend(opts) elif preset == 'RV': opts = ["-fps", str(rd.fps), "-play", "[ %s ]" % file] diff --git a/release/scripts/presets/render/HDTV_1080p.py b/release/scripts/presets/render/HDTV_1080p.py index 75a5faeb27d..7693dae9347 100644 --- a/release/scripts/presets/render/HDTV_1080p.py +++ b/release/scripts/presets/render/HDTV_1080p.py @@ -1,7 +1,7 @@ -bpy.context.scene.render_data.resolution_x = 1920 -bpy.context.scene.render_data.resolution_y = 1080 -bpy.context.scene.render_data.resolution_percentage = 100 -bpy.context.scene.render_data.pixel_aspect_x = 1 -bpy.context.scene.render_data.pixel_aspect_y = 1 -bpy.context.scene.render_data.fps = 24 -bpy.context.scene.render_data.fps_base = 1 +bpy.context.scene.render.resolution_x = 1920 +bpy.context.scene.render.resolution_y = 1080 +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 diff --git a/release/scripts/presets/render/HDTV_720p.py b/release/scripts/presets/render/HDTV_720p.py index 4f46f4045e0..ee16c1e8b33 100644 --- a/release/scripts/presets/render/HDTV_720p.py +++ b/release/scripts/presets/render/HDTV_720p.py @@ -1,7 +1,7 @@ -bpy.context.scene.render_data.resolution_x = 1280 -bpy.context.scene.render_data.resolution_y = 720 -bpy.context.scene.render_data.resolution_percentage = 100 -bpy.context.scene.render_data.pixel_aspect_x = 1 -bpy.context.scene.render_data.pixel_aspect_y = 1 -bpy.context.scene.render_data.fps = 24 -bpy.context.scene.render_data.fps_base = 1 +bpy.context.scene.render.resolution_x = 1280 +bpy.context.scene.render.resolution_y = 720 +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 diff --git a/release/scripts/presets/render/TV_NTSC.py b/release/scripts/presets/render/TV_NTSC.py index c6bc7518fac..cd6322fd21a 100644 --- a/release/scripts/presets/render/TV_NTSC.py +++ b/release/scripts/presets/render/TV_NTSC.py @@ -1,7 +1,7 @@ -bpy.context.scene.render_data.resolution_x = 720 -bpy.context.scene.render_data.resolution_y = 480 -bpy.context.scene.render_data.resolution_percentage = 100 -bpy.context.scene.render_data.pixel_aspect_x = 10 -bpy.context.scene.render_data.pixel_aspect_y = 11 -bpy.context.scene.render_data.fps = 30 -bpy.context.scene.render_data.fps_base = 1.001 +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 diff --git a/release/scripts/presets/render/TV_PAL.py b/release/scripts/presets/render/TV_PAL.py index 0992b9b8de8..4a71ad021fe 100644 --- a/release/scripts/presets/render/TV_PAL.py +++ b/release/scripts/presets/render/TV_PAL.py @@ -1,7 +1,7 @@ -bpy.context.scene.render_data.resolution_x = 720 -bpy.context.scene.render_data.resolution_y = 576 -bpy.context.scene.render_data.resolution_percentage = 100 -bpy.context.scene.render_data.pixel_aspect_x = 54 -bpy.context.scene.render_data.pixel_aspect_y = 51 -bpy.context.scene.render_data.fps = 25 -bpy.context.scene.render_data.fps_base = 1 +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 diff --git a/release/scripts/presets/render/TV_PAL_16_colon_9.py b/release/scripts/presets/render/TV_PAL_16_colon_9.py index 9b85805352d..516209a877d 100644 --- a/release/scripts/presets/render/TV_PAL_16_colon_9.py +++ b/release/scripts/presets/render/TV_PAL_16_colon_9.py @@ -1,7 +1,7 @@ -bpy.context.scene.render_data.resolution_x = 720 -bpy.context.scene.render_data.resolution_y = 576 -bpy.context.scene.render_data.resolution_percentage = 100 -bpy.context.scene.render_data.pixel_aspect_x = 64 -bpy.context.scene.render_data.pixel_aspect_y = 45 -bpy.context.scene.render_data.fps = 25 -bpy.context.scene.render_data.fps_base = 1 +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.fps = 25 +bpy.context.scene.render.fps_base = 1 diff --git a/release/scripts/ui/properties_game.py b/release/scripts/ui/properties_game.py index 5697911bf1f..41af955d9ec 100644 --- a/release/scripts/ui/properties_game.py +++ b/release/scripts/ui/properties_game.py @@ -29,7 +29,7 @@ class PhysicsButtonsPanel(bpy.types.Panel): def poll(self, context): ob = context.active_object - rd = context.scene.render_data + rd = context.scene.render return ob and ob.game and (rd.engine == 'BLENDER_GAME') @@ -166,7 +166,7 @@ class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel): def poll(self, context): game = context.object.game - rd = context.scene.render_data + rd = context.scene.render return (game.physics_type in ('DYNAMIC', 'RIGID_BODY', 'SENSOR', 'SOFT_BODY', 'STATIC')) and (rd.engine == 'BLENDER_GAME') def draw_header(self, context): @@ -202,7 +202,7 @@ class RenderButtonsPanel(bpy.types.Panel): bl_context = "render" def poll(self, context): - rd = context.scene.render_data + rd = context.scene.render return (rd.engine == 'BLENDER_GAME') @@ -390,7 +390,7 @@ class WorldButtonsPanel(bpy.types.Panel): def poll(self, context): scene = context.scene - return (scene.render_data.engine == 'BLENDER_GAME') and (scene.world is not None) + return (scene.render.engine == 'BLENDER_GAME') and (scene.world is not None) class WORLD_PT_game_context_world(WorldButtonsPanel): @@ -398,7 +398,7 @@ class WORLD_PT_game_context_world(WorldButtonsPanel): bl_show_header = False def poll(self, context): - rd = context.scene.render_data + rd = context.scene.render return (context.scene) and (rd.use_game_engine) def draw(self, context): diff --git a/release/scripts/ui/properties_material.py b/release/scripts/ui/properties_material.py index 4c44e79d884..13bfd7a7f5d 100644 --- a/release/scripts/ui/properties_material.py +++ b/release/scripts/ui/properties_material.py @@ -62,7 +62,7 @@ class MaterialButtonsPanel(bpy.types.Panel): def poll(self, context): mat = context.material - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (engine in self.COMPAT_ENGINES) @@ -83,7 +83,7 @@ class MATERIAL_PT_context_material(MaterialButtonsPanel): # An exception, dont call the parent poll func because # this manages materials for all engine types - engine = context.scene.render_data.engine + engine = context.scene.render.engine return (context.material or context.object) and (engine in self.COMPAT_ENGINES) def draw(self, context): @@ -149,7 +149,7 @@ class MATERIAL_PT_shading(MaterialButtonsPanel): def poll(self, context): mat = active_node_mat(context.material) - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (mat.type in ('SURFACE', 'WIRE', 'HALO')) and (engine in self.COMPAT_ENGINES) def draw(self, context): @@ -188,7 +188,7 @@ class MATERIAL_PT_strand(MaterialButtonsPanel): def poll(self, context): mat = context.material - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (mat.type in ('SURFACE', 'WIRE', 'HALO')) and (engine in self.COMPAT_ENGINES) def draw(self, context): @@ -260,7 +260,7 @@ class MATERIAL_PT_options(MaterialButtonsPanel): def poll(self, context): mat = active_node_mat(context.material) - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (mat.type in ('SURFACE', 'WIRE', 'HALO')) and (engine in self.COMPAT_ENGINES) def draw(self, context): @@ -306,7 +306,7 @@ class MATERIAL_PT_shadow(MaterialButtonsPanel): def poll(self, context): mat = active_node_mat(context.material) - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES) def draw(self, context): @@ -343,7 +343,7 @@ class MATERIAL_PT_diffuse(MaterialButtonsPanel): def poll(self, context): mat = active_node_mat(context.material) - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES) def draw(self, context): @@ -414,7 +414,7 @@ class MATERIAL_PT_specular(MaterialButtonsPanel): def poll(self, context): mat = active_node_mat(context.material) - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES) def draw(self, context): @@ -484,7 +484,7 @@ class MATERIAL_PT_sss(MaterialButtonsPanel): def poll(self, context): mat = active_node_mat(context.material) - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES) def draw_header(self, context): @@ -536,7 +536,7 @@ class MATERIAL_PT_mirror(MaterialButtonsPanel): def poll(self, context): mat = active_node_mat(context.material) - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES) def draw_header(self, context): @@ -595,7 +595,7 @@ class MATERIAL_PT_transp(MaterialButtonsPanel): def poll(self, context): mat = active_node_mat(context.material) - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES) def draw_header(self, context): @@ -662,7 +662,7 @@ class MATERIAL_PT_transp_game(MaterialButtonsPanel): def poll(self, context): mat = active_node_mat(context.material) - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (engine in self.COMPAT_ENGINES) def draw_header(self, context): @@ -696,7 +696,7 @@ class MATERIAL_PT_halo(MaterialButtonsPanel): def poll(self, context): mat = context.material - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (mat.type == 'HALO') and (engine in self.COMPAT_ENGINES) def draw(self, context): @@ -746,7 +746,7 @@ class MATERIAL_PT_flare(MaterialButtonsPanel): def poll(self, context): mat = context.material - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (mat.type == 'HALO') and (engine in self.COMPAT_ENGINES) def draw_header(self, context): @@ -782,7 +782,7 @@ class VolumeButtonsPanel(bpy.types.Panel): def poll(self, context): mat = context.material - engine = context.scene.render_data.engine + engine = context.scene.render.engine return mat and (mat.type == 'VOLUME') and (engine in self.COMPAT_ENGINES) diff --git a/release/scripts/ui/properties_physics_cloth.py b/release/scripts/ui/properties_physics_cloth.py index d1ff53897a4..7a65420e172 100644 --- a/release/scripts/ui/properties_physics_cloth.py +++ b/release/scripts/ui/properties_physics_cloth.py @@ -47,7 +47,7 @@ class PhysicButtonsPanel(bpy.types.Panel): def poll(self, context): ob = context.object - rd = context.scene.render_data + rd = context.scene.render return (ob and ob.type == 'MESH') and (not rd.use_game_engine) diff --git a/release/scripts/ui/properties_physics_field.py b/release/scripts/ui/properties_physics_field.py index db85315c5de..e0be01d4c1c 100644 --- a/release/scripts/ui/properties_physics_field.py +++ b/release/scripts/ui/properties_physics_field.py @@ -32,7 +32,7 @@ class PhysicButtonsPanel(bpy.types.Panel): bl_context = "physics" def poll(self, context): - rd = context.scene.render_data + rd = context.scene.render return (context.object) and (not rd.use_game_engine) @@ -174,7 +174,7 @@ class PHYSICS_PT_collision(PhysicButtonsPanel): def poll(self, context): ob = context.object - rd = context.scene.render_data + rd = context.scene.render return (ob and ob.type == 'MESH') and (not rd.use_game_engine) def draw(self, context): diff --git a/release/scripts/ui/properties_physics_fluid.py b/release/scripts/ui/properties_physics_fluid.py index 7434d2173e3..9b36b98bc24 100644 --- a/release/scripts/ui/properties_physics_fluid.py +++ b/release/scripts/ui/properties_physics_fluid.py @@ -29,7 +29,7 @@ class PhysicButtonsPanel(bpy.types.Panel): def poll(self, context): ob = context.object - rd = context.scene.render_data + rd = context.scene.render return (ob and ob.type == 'MESH') and (not rd.use_game_engine) diff --git a/release/scripts/ui/properties_physics_smoke.py b/release/scripts/ui/properties_physics_smoke.py index 290d3b13d20..1f91b761e1a 100644 --- a/release/scripts/ui/properties_physics_smoke.py +++ b/release/scripts/ui/properties_physics_smoke.py @@ -33,7 +33,7 @@ class PhysicButtonsPanel(bpy.types.Panel): def poll(self, context): ob = context.object - rd = context.scene.render_data + rd = context.scene.render return (ob and ob.type == 'MESH') and (not rd.use_game_engine) diff --git a/release/scripts/ui/properties_physics_softbody.py b/release/scripts/ui/properties_physics_softbody.py index cb75301c7af..8a59e087dc3 100644 --- a/release/scripts/ui/properties_physics_softbody.py +++ b/release/scripts/ui/properties_physics_softbody.py @@ -37,7 +37,7 @@ class PhysicButtonsPanel(bpy.types.Panel): def poll(self, context): ob = context.object - rd = context.scene.render_data + rd = context.scene.render return (ob and ob.type == 'MESH') and (not rd.use_game_engine) diff --git a/release/scripts/ui/properties_render.py b/release/scripts/ui/properties_render.py index 627a7c3e2e8..8bf3318c3e2 100644 --- a/release/scripts/ui/properties_render.py +++ b/release/scripts/ui/properties_render.py @@ -36,7 +36,7 @@ class RenderButtonsPanel(bpy.types.Panel): # 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 (context.scene and rd.use_game_engine is False) and (rd.engine in self.COMPAT_ENGINES) @@ -47,7 +47,7 @@ class RENDER_PT_render(RenderButtonsPanel): def draw(self, context): layout = self.layout - rd = context.scene.render_data + rd = context.scene.render wide_ui = context.region.width > narrowui split = layout.split() @@ -71,7 +71,7 @@ class RENDER_PT_layers(RenderButtonsPanel): layout = self.layout scene = context.scene - rd = scene.render_data + rd = scene.render wide_ui = context.region.width > narrowui row = layout.row() @@ -176,7 +176,7 @@ class RENDER_PT_shading(RenderButtonsPanel): def draw(self, context): layout = self.layout - rd = context.scene.render_data + rd = context.scene.render wide_ui = context.region.width > narrowui split = layout.split() @@ -202,7 +202,7 @@ class RENDER_PT_performance(RenderButtonsPanel): def draw(self, context): layout = self.layout - rd = context.scene.render_data + rd = context.scene.render wide_ui = context.region.width > narrowui split = layout.split() @@ -246,7 +246,7 @@ class RENDER_PT_post_processing(RenderButtonsPanel): def draw(self, context): layout = self.layout - rd = context.scene.render_data + rd = context.scene.render wide_ui = context.region.width > narrowui split = layout.split() @@ -289,7 +289,7 @@ class RENDER_PT_output(RenderButtonsPanel): def draw(self, context): layout = self.layout - rd = context.scene.render_data + rd = context.scene.render wide_ui = context.region.width > narrowui layout.prop(rd, "output_path", text="") @@ -355,7 +355,7 @@ class RENDER_PT_output(RenderButtonsPanel): elif rd.file_format == 'QUICKTIME_CARBON': split = layout.split() - split.operator("scene.render_data_set_quicktime_codec") + split.operator("scene.render_set_quicktime_codec") elif rd.file_format == 'QUICKTIME_QTKIT': split = layout.split() @@ -370,13 +370,13 @@ class RENDER_PT_encoding(RenderButtonsPanel): COMPAT_ENGINES = {'BLENDER_RENDER'} def poll(self, context): - rd = context.scene.render_data + rd = context.scene.render return rd.file_format in ('FFMPEG', 'XVID', 'H264', 'THEORA') def draw(self, context): layout = self.layout - rd = context.scene.render_data + rd = context.scene.render wide_ui = context.region.width > narrowui split = layout.split() @@ -439,14 +439,14 @@ class RENDER_PT_antialiasing(RenderButtonsPanel): COMPAT_ENGINES = {'BLENDER_RENDER'} def draw_header(self, context): - rd = context.scene.render_data + rd = context.scene.render self.layout.prop(rd, "antialiasing", text="") def draw(self, context): layout = self.layout - rd = context.scene.render_data + rd = context.scene.render wide_ui = context.region.width > narrowui layout.active = rd.antialiasing @@ -470,14 +470,14 @@ class RENDER_PT_motion_blur(RenderButtonsPanel): COMPAT_ENGINES = {'BLENDER_RENDER'} def draw_header(self, context): - rd = context.scene.render_data + rd = context.scene.render self.layout.prop(rd, "motion_blur", text="") def draw(self, context): layout = self.layout - rd = context.scene.render_data + rd = context.scene.render layout.active = rd.motion_blur row = layout.row() @@ -492,7 +492,7 @@ class RENDER_PT_dimensions(RenderButtonsPanel): layout = self.layout scene = context.scene - rd = scene.render_data + rd = scene.render wide_ui = context.region.width > narrowui row = layout.row().split() @@ -538,14 +538,14 @@ class RENDER_PT_stamp(RenderButtonsPanel): COMPAT_ENGINES = {'BLENDER_RENDER'} def draw_header(self, context): - rd = context.scene.render_data + rd = context.scene.render self.layout.prop(rd, "render_stamp", text="") def draw(self, context): layout = self.layout - rd = context.scene.render_data + rd = context.scene.render wide_ui = context.region.width > narrowui layout.active = rd.render_stamp @@ -586,7 +586,7 @@ class RENDER_PT_bake(RenderButtonsPanel): def draw(self, context): layout = self.layout - rd = context.scene.render_data + rd = context.scene.render wide_ui = context.region.width > narrowui layout.operator("object.bake_image", icon='RENDER_STILL') diff --git a/release/scripts/ui/properties_scene.py b/release/scripts/ui/properties_scene.py index 7c342053a40..0209140ef4e 100644 --- a/release/scripts/ui/properties_scene.py +++ b/release/scripts/ui/properties_scene.py @@ -192,13 +192,13 @@ class SCENE_PT_simplify(SceneButtonsPanel): def draw_header(self, context): scene = context.scene - rd = scene.render_data + rd = scene.render self.layout.prop(rd, "use_simplify", text="") def draw(self, context): layout = self.layout scene = context.scene - rd = scene.render_data + rd = scene.render wide_ui = context.region.width > narrowui layout.active = rd.use_simplify diff --git a/release/scripts/ui/properties_world.py b/release/scripts/ui/properties_world.py index ee529e53872..1ee47e942a0 100644 --- a/release/scripts/ui/properties_world.py +++ b/release/scripts/ui/properties_world.py @@ -30,7 +30,7 @@ class WorldButtonsPanel(bpy.types.Panel): # 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 (context.world) and (not rd.use_game_engine) and (rd.engine in self.COMPAT_ENGINES) @@ -48,7 +48,7 @@ class WORLD_PT_context_world(WorldButtonsPanel): COMPAT_ENGINES = {'BLENDER_RENDER'} def poll(self, context): - rd = context.scene.render_data + rd = context.scene.render return (not rd.use_game_engine) and (rd.engine in self.COMPAT_ENGINES) def draw(self, context): diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py index b5256018249..3fd7025a4f7 100644 --- a/release/scripts/ui/space_image.py +++ b/release/scripts/ui/space_image.py @@ -349,7 +349,7 @@ class IMAGE_PT_game_properties(bpy.types.Panel): bl_label = "Game Properties" def poll(self, context): - rd = context.scene.render_data + rd = context.scene.render sima = context.space_data return (sima and sima.image) and (rd.engine == 'BLENDER_GAME') diff --git a/release/scripts/ui/space_info.py b/release/scripts/ui/space_info.py index f48c64aa7cd..ff0646ba788 100644 --- a/release/scripts/ui/space_info.py +++ b/release/scripts/ui/space_info.py @@ -28,7 +28,7 @@ class INFO_HT_header(bpy.types.Header): window = context.window scene = context.scene - rd = scene.render_data + rd = scene.render row = layout.row(align=True) row.template_header() @@ -263,7 +263,7 @@ class INFO_MT_render(bpy.types.Menu): def draw(self, context): layout = self.layout - # rd = context.scene.render_data + # rd = context.scene.render layout.operator("screen.render", text="Render Image", icon='RENDER_STILL') layout.operator("screen.render", text="Render Animation", icon='RENDER_ANIMATION').animation = True diff --git a/release/scripts/ui/space_node.py b/release/scripts/ui/space_node.py index ab02b636605..f510235a39d 100644 --- a/release/scripts/ui/space_node.py +++ b/release/scripts/ui/space_node.py @@ -60,10 +60,10 @@ class NODE_HT_header(bpy.types.Header): layout.prop(snode_id, "use_nodes") elif snode.tree_type == 'COMPOSITING': - snode_id = snode.id + scene = snode.id - layout.prop(snode_id, "use_nodes") - layout.prop(snode_id.render_data, "free_unused_nodes", text="Free Unused") + layout.prop(scene, "use_nodes") + layout.prop(scene.render, "free_unused_nodes", text="Free Unused") layout.prop(snode, "backdrop") diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index 22981f13122..4cbabc71235 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -312,7 +312,7 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel): def draw(self, context): layout = self.layout - render_data = context.scene.render_data + render = context.scene.render strip = act_strip(context) split = layout.split(percentage=0.3) @@ -348,7 +348,7 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel): col.prop(strip, "start_frame") subrow = col.split(percentage=0.66) subrow.prop(strip, "length") - subrow.label(text="%.2f sec" % (strip.length / (render_data.fps / render_data.fps_base))) + subrow.label(text="%.2f sec" % (strip.length / (render.fps / render.fps_base))) col = layout.column(align=True) col.label(text="Offset:") diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 9e6ccba4828..2ab74dd2a3e 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -196,9 +196,9 @@ extern StructRNA RNA_EnumPropertyItem; extern StructRNA RNA_EnvironmentMap; extern StructRNA RNA_EnvironmentMapTexture; extern StructRNA RNA_Event; -extern StructRNA RNA_Extension; extern StructRNA RNA_ExplodeModifier; extern StructRNA RNA_ExpressionController; +extern StructRNA RNA_Extension; extern StructRNA RNA_FCurve; extern StructRNA RNA_FCurveSample; extern StructRNA RNA_FieldSettings; @@ -373,11 +373,11 @@ extern StructRNA RNA_RenderEngine; extern StructRNA RNA_RenderLayer; extern StructRNA RNA_RenderPass; extern StructRNA RNA_RenderResult; +extern StructRNA RNA_RenderSettings; extern StructRNA RNA_RGBANodeSocket; extern StructRNA RNA_RigidBodyJointConstraint; extern StructRNA RNA_Scene; extern StructRNA RNA_SceneGameData; -extern StructRNA RNA_SceneRenderData; extern StructRNA RNA_SceneRenderLayer; extern StructRNA RNA_SceneSequence; extern StructRNA RNA_Screen; diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 04e420f1c71..dca94531d10 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -354,12 +354,12 @@ static void rna_Scene_active_keying_set_index_range(PointerRNA *ptr, int *min, i } -static char *rna_SceneRenderData_path(PointerRNA *ptr) +static char *rna_RenderSettings_path(PointerRNA *ptr) { - return BLI_sprintfN("render_data"); + return BLI_sprintfN("render"); } -static int rna_SceneRenderData_threads_get(PointerRNA *ptr) +static int rna_RenderSettings_threads_get(PointerRNA *ptr) { RenderData *rd= (RenderData*)ptr->data; @@ -369,7 +369,7 @@ static int rna_SceneRenderData_threads_get(PointerRNA *ptr) return BLI_system_thread_count(); } -static int rna_SceneRenderData_save_buffers_get(PointerRNA *ptr) +static int rna_RenderSettings_save_buffers_get(PointerRNA *ptr) { RenderData *rd= (RenderData*)ptr->data; if(rd->mode & R_BORDER) @@ -378,14 +378,14 @@ static int rna_SceneRenderData_save_buffers_get(PointerRNA *ptr) return (rd->scemode & (R_EXR_TILE_FILE|R_FULL_SAMPLE)) != 0; } -static int rna_SceneRenderData_full_sample_get(PointerRNA *ptr) +static int rna_RenderSettings_full_sample_get(PointerRNA *ptr) { RenderData *rd= (RenderData*)ptr->data; return (rd->scemode & R_FULL_SAMPLE) && !(rd->mode & R_BORDER); } -static void rna_SceneRenderData_file_format_set(PointerRNA *ptr, int value) +static void rna_RenderSettings_file_format_set(PointerRNA *ptr, int value) { RenderData *rd= (RenderData*)ptr->data; @@ -413,7 +413,7 @@ static void rna_SceneRender_file_ext_get(PointerRNA *ptr, char *str) BKE_add_image_extension(str, rd->imtype); } -void rna_SceneRenderData_jpeg2k_preset_update(RenderData *rd) +void rna_RenderSettings_jpeg2k_preset_update(RenderData *rd) { rd->subimtype &= ~(R_JPEG2K_12BIT|R_JPEG2K_16BIT | R_JPEG2K_CINE_PRESET|R_JPEG2K_CINE_48FPS); @@ -435,37 +435,37 @@ void rna_SceneRenderData_jpeg2k_preset_update(RenderData *rd) } #ifdef WITH_OPENJPEG -static void rna_SceneRenderData_jpeg2k_preset_set(PointerRNA *ptr, int value) +static void rna_RenderSettings_jpeg2k_preset_set(PointerRNA *ptr, int value) { RenderData *rd= (RenderData*)ptr->data; rd->jp2_preset= value; - rna_SceneRenderData_jpeg2k_preset_update(rd); + rna_RenderSettings_jpeg2k_preset_update(rd); } -static void rna_SceneRenderData_jpeg2k_depth_set(PointerRNA *ptr, int value) +static void rna_RenderSettings_jpeg2k_depth_set(PointerRNA *ptr, int value) { RenderData *rd= (RenderData*)ptr->data; rd->jp2_depth= value; - rna_SceneRenderData_jpeg2k_preset_update(rd); + rna_RenderSettings_jpeg2k_preset_update(rd); } #endif #ifdef WITH_QUICKTIME -static int rna_SceneRenderData_qtcodecsettings_codecType_get(PointerRNA *ptr) +static int rna_RenderSettings_qtcodecsettings_codecType_get(PointerRNA *ptr) { RenderData *rd= (RenderData*)ptr->data; return quicktime_rnatmpvalue_from_codectype(rd->qtcodecsettings.codecType); } -static void rna_SceneRenderData_qtcodecsettings_codecType_set(PointerRNA *ptr, int value) +static void rna_RenderSettings_qtcodecsettings_codecType_set(PointerRNA *ptr, int value) { RenderData *rd= (RenderData*)ptr->data; rd->qtcodecsettings.codecType = quicktime_codecType_from_rnatmpvalue(value); } -static EnumPropertyItem *rna_SceneRenderData_qtcodecsettings_codecType_itemf(bContext *C, PointerRNA *ptr, int *free) +static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bContext *C, PointerRNA *ptr, int *free) { EnumPropertyItem *item= NULL; EnumPropertyItem tmp = {0, "", 0, "", ""}; @@ -492,19 +492,19 @@ static EnumPropertyItem *rna_SceneRenderData_qtcodecsettings_codecType_itemf(bCo } #endif -static int rna_SceneRenderData_active_layer_index_get(PointerRNA *ptr) +static int rna_RenderSettings_active_layer_index_get(PointerRNA *ptr) { RenderData *rd= (RenderData*)ptr->data; return rd->actlay; } -static void rna_SceneRenderData_active_layer_index_set(PointerRNA *ptr, int value) +static void rna_RenderSettings_active_layer_index_set(PointerRNA *ptr, int value) { RenderData *rd= (RenderData*)ptr->data; rd->actlay= value; } -static void rna_SceneRenderData_active_layer_index_range(PointerRNA *ptr, int *min, int *max) +static void rna_RenderSettings_active_layer_index_range(PointerRNA *ptr, int *min, int *max) { RenderData *rd= (RenderData*)ptr->data; @@ -513,7 +513,7 @@ static void rna_SceneRenderData_active_layer_index_range(PointerRNA *ptr, int *m *max= MAX2(0, *max); } -static void rna_SceneRenderData_engine_set(PointerRNA *ptr, int value) +static void rna_RenderSettings_engine_set(PointerRNA *ptr, int value) { RenderData *rd= (RenderData*)ptr->data; RenderEngineType *type= BLI_findlink(&R_engines, value); @@ -522,7 +522,7 @@ static void rna_SceneRenderData_engine_set(PointerRNA *ptr, int value) BLI_strncpy(rd->engine, type->idname, sizeof(rd->engine)); } -static EnumPropertyItem *rna_SceneRenderData_engine_itemf(bContext *C, PointerRNA *ptr, int *free) +static EnumPropertyItem *rna_RenderSettings_engine_itemf(bContext *C, PointerRNA *ptr, int *free) { RenderEngineType *type; EnumPropertyItem *item= NULL; @@ -542,7 +542,7 @@ static EnumPropertyItem *rna_SceneRenderData_engine_itemf(bContext *C, PointerRN return item; } -static int rna_SceneRenderData_engine_get(PointerRNA *ptr) +static int rna_RenderSettings_engine_get(PointerRNA *ptr) { RenderData *rd= (RenderData*)ptr->data; RenderEngineType *type; @@ -555,7 +555,7 @@ static int rna_SceneRenderData_engine_get(PointerRNA *ptr) return 0; } -static void rna_SceneRenderData_color_management_update(Main *bmain, Scene *unused, PointerRNA *ptr) +static void rna_RenderSettings_color_management_update(Main *bmain, Scene *unused, PointerRNA *ptr) { /* reset image nodes */ Scene *scene= (Scene*)ptr->id.data; @@ -595,12 +595,12 @@ static void rna_SceneRenderLayer_name_set(PointerRNA *ptr, const char *value) } } -static int rna_SceneRenderData_multiple_engines_get(PointerRNA *ptr) +static int rna_RenderSettings_multiple_engines_get(PointerRNA *ptr) { return (BLI_countlist(&R_engines) > 1); } -static int rna_SceneRenderData_use_game_engine_get(PointerRNA *ptr) +static int rna_RenderSettings_use_game_engine_get(PointerRNA *ptr) { RenderData *rd= (RenderData*)ptr->data; RenderEngineType *type; @@ -1816,10 +1816,10 @@ static void rna_def_scene_render_data(BlenderRNA *brna) {0, "BLENDER_RENDER", 0, "Blender Render", ""}, {0, NULL, 0, NULL, NULL}}; - srna= RNA_def_struct(brna, "SceneRenderData", NULL); + srna= RNA_def_struct(brna, "RenderSettings", NULL); RNA_def_struct_sdna(srna, "RenderData"); RNA_def_struct_nested(brna, srna, "Scene"); - RNA_def_struct_path_func(srna, "rna_SceneRenderData_path"); + RNA_def_struct_path_func(srna, "rna_RenderSettings_path"); RNA_def_struct_ui_text(srna, "Render Data", "Rendering settings for a Scene datablock"); prop= RNA_def_property(srna, "color_mode", PROP_ENUM, PROP_NONE); @@ -1941,14 +1941,14 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "jpeg2k_preset", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "jp2_preset"); RNA_def_property_enum_items(prop, jp2_preset_items); - RNA_def_property_enum_funcs(prop, NULL, "rna_SceneRenderData_jpeg2k_preset_set", NULL); + RNA_def_property_enum_funcs(prop, NULL, "rna_RenderSettings_jpeg2k_preset_set", NULL); RNA_def_property_ui_text(prop, "Preset", "Use a DCI Standard preset for saving jpeg2000"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "jpeg2k_depth", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "jp2_depth"); RNA_def_property_enum_items(prop, jp2_depth_items); - RNA_def_property_enum_funcs(prop, NULL, "rna_SceneRenderData_jpeg2k_depth_set", NULL); + RNA_def_property_enum_funcs(prop, NULL, "rna_RenderSettings_jpeg2k_depth_set", NULL); RNA_def_property_ui_text(prop, "Depth", "Bit depth per channel"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); @@ -1964,9 +1964,9 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "quicktime_codec_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "qtcodecsettings.codecType"); RNA_def_property_enum_items(prop, quicktime_codec_type_items); - RNA_def_property_enum_funcs(prop, "rna_SceneRenderData_qtcodecsettings_codecType_get", - "rna_SceneRenderData_qtcodecsettings_codecType_set", - "rna_SceneRenderData_qtcodecsettings_codecType_itemf"); + RNA_def_property_enum_funcs(prop, "rna_RenderSettings_qtcodecsettings_codecType_get", + "rna_RenderSettings_qtcodecsettings_codecType_set", + "rna_RenderSettings_qtcodecsettings_codecType_itemf"); RNA_def_property_ui_text(prop, "Codec", "QuickTime codec type"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); @@ -2203,7 +2203,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "threads", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "threads"); RNA_def_property_range(prop, 1, BLENDER_MAX_THREADS); - RNA_def_property_int_funcs(prop, "rna_SceneRenderData_threads_get", NULL, NULL); + RNA_def_property_int_funcs(prop, "rna_RenderSettings_threads_get", NULL, NULL); RNA_def_property_ui_text(prop, "Threads", "Number of CPU threads to use simultaneously while rendering (for multi-core/CPU systems)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); @@ -2281,7 +2281,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "color_management", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "color_mgt_flag", R_COLOR_MANAGEMENT); RNA_def_property_ui_text(prop, "Color Management", "Use color profiles and gamma corrected imaging pipeline"); - RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS|NC_MATERIAL|ND_SHADING, "rna_SceneRenderData_color_management_update"); + RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS|NC_MATERIAL|ND_SHADING, "rna_RenderSettings_color_management_update"); prop= RNA_def_property(srna, "use_file_extension", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_EXTENSION); @@ -2291,7 +2291,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "file_format", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "imtype"); RNA_def_property_enum_items(prop, image_type_items); - RNA_def_property_enum_funcs(prop, NULL, "rna_SceneRenderData_file_format_set", NULL); + RNA_def_property_enum_funcs(prop, NULL, "rna_RenderSettings_file_format_set", NULL); RNA_def_property_ui_text(prop, "File Format", "File format to save the rendered images as"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); @@ -2313,13 +2313,13 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "save_buffers", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_EXR_TILE_FILE); - RNA_def_property_boolean_funcs(prop, "rna_SceneRenderData_save_buffers_get", NULL); + RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_save_buffers_get", NULL); RNA_def_property_ui_text(prop, "Save Buffers","Save tiles for all RenderLayers and SceneNodes to files in the temp directory (saves memory, required for Full Sample)"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); prop= RNA_def_property(srna, "full_sample", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FULL_SAMPLE); - RNA_def_property_boolean_funcs(prop, "rna_SceneRenderData_full_sample_get", NULL); + RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_full_sample_get", NULL); RNA_def_property_ui_text(prop, "Full Sample","Save for every anti-aliasing sample the entire RenderLayer results. This solves anti-aliasing issues with compositing"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); @@ -2487,24 +2487,24 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop= RNA_def_property(srna, "active_layer_index", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "actlay"); - RNA_def_property_int_funcs(prop, "rna_SceneRenderData_active_layer_index_get", "rna_SceneRenderData_active_layer_index_set", "rna_SceneRenderData_active_layer_index_range"); + RNA_def_property_int_funcs(prop, "rna_RenderSettings_active_layer_index_get", "rna_RenderSettings_active_layer_index_set", "rna_RenderSettings_active_layer_index_range"); RNA_def_property_ui_text(prop, "Active Layer Index", "Active index in render layer array"); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); /* engine */ prop= RNA_def_property(srna, "engine", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, engine_items); - RNA_def_property_enum_funcs(prop, "rna_SceneRenderData_engine_get", "rna_SceneRenderData_engine_set", "rna_SceneRenderData_engine_itemf"); + RNA_def_property_enum_funcs(prop, "rna_RenderSettings_engine_get", "rna_RenderSettings_engine_set", "rna_RenderSettings_engine_itemf"); RNA_def_property_ui_text(prop, "Engine", "Engine to use for rendering"); RNA_def_property_update(prop, NC_WINDOW, NULL); prop= RNA_def_property(srna, "multiple_engines", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_funcs(prop, "rna_SceneRenderData_multiple_engines_get", NULL); + RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_multiple_engines_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Multiple Engines", "More than one rendering engine is available"); prop= RNA_def_property(srna, "use_game_engine", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_funcs(prop, "rna_SceneRenderData_use_game_engine_get", NULL); + RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_use_game_engine_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Use Game Engine", "Current rendering engine is a game engine"); @@ -2830,10 +2830,10 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Physics_update"); /* Render Data */ - prop= RNA_def_property(srna, "render_data", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "render", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "r"); - RNA_def_property_struct_type(prop, "SceneRenderData"); + RNA_def_property_struct_type(prop, "RenderSettings"); RNA_def_property_ui_text(prop, "Render Data", ""); /* Markers */ |