[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31435] trunk/blender: rna renaming for Render* structs

Campbell Barton ideasman42 at gmail.com
Wed Aug 18 06:10:25 CEST 2010


Revision: 31435
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31435
Author:   campbellbarton
Date:     2010-08-18 06:10:23 +0200 (Wed, 18 Aug 2010)

Log Message:
-----------
rna renaming for Render* structs

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpyml.py
    trunk/blender/release/scripts/op/presets.py
    trunk/blender/release/scripts/op/screen_play_rendered_anim.py
    trunk/blender/release/scripts/ui/properties_data_lamp.py
    trunk/blender/release/scripts/ui/properties_render.py
    trunk/blender/release/scripts/ui/properties_scene.py
    trunk/blender/release/scripts/ui/space_info.py
    trunk/blender/release/scripts/ui/space_node.py
    trunk/blender/source/blender/editors/space_image/image_buttons.c
    trunk/blender/source/blender/makesrna/intern/rna_image.c
    trunk/blender/source/blender/makesrna/intern/rna_render.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/release/scripts/modules/bpyml.py
===================================================================
--- trunk/blender/release/scripts/modules/bpyml.py	2010-08-18 03:56:14 UTC (rev 31434)
+++ trunk/blender/release/scripts/modules/bpyml.py	2010-08-18 04:10:23 UTC (rev 31435)
@@ -163,18 +163,18 @@
          ui() [
             split() [
                 column() [
-                    prop(data='context.scene.render', property='stamp_time', text='Time'),
-                    prop(data='context.scene.render', property='stamp_date', text='Date'),
-                    prop(data='context.scene.render', property='stamp_render_time', text='RenderTime'),
-                    prop(data='context.scene.render', property='stamp_frame', text='Frame'),
-                    prop(data='context.scene.render', property='stamp_scene', text='Scene'),
-                    prop(data='context.scene.render', property='stamp_camera', text='Camera'),
-                    prop(data='context.scene.render', property='stamp_filename', text='Filename'),
-                    prop(data='context.scene.render', property='stamp_marker', text='Marker'),
-                    prop(data='context.scene.render', property='stamp_sequencer_strip', text='Seq. Strip')
+                    prop(data='context.scene.render', property='use_stamp_time', text='Time'),
+                    prop(data='context.scene.render', property='use_stamp_date', text='Date'),
+                    prop(data='context.scene.render', property='use_stamp_render_time', text='RenderTime'),
+                    prop(data='context.scene.render', property='use_stamp_frame', text='Frame'),
+                    prop(data='context.scene.render', property='use_stamp_scene', text='Scene'),
+                    prop(data='context.scene.render', property='use_stamp_camera', text='Camera'),
+                    prop(data='context.scene.render', property='use_stamp_filename', text='Filename'),
+                    prop(data='context.scene.render', property='use_stamp_marker', text='Marker'),
+                    prop(data='context.scene.render', property='use_stamp_sequencer_strip', text='Seq. Strip')
                 ],
                 column() [
-                    active(expr='context.scene.render.render_stamp'),
+                    active(expr='context.scene.render.use_stamp'),
                     prop(data='context.scene.render', property='stamp_foreground', slider=True),
                     prop(data='context.scene.render', property='stamp_background', slider=True),
                     separator(),
@@ -182,9 +182,9 @@
                 ]
             ],
             split(percentage=0.2) [
-                prop(data='context.scene.render', property='stamp_note', text='Note'),
+                prop(data='context.scene.render', property='use_stamp_note', text='Note'),
                 row() [
-                    active(expr='context.scene.render.stamp_note'),
+                    active(expr='context.scene.render.use_stamp_note'),
                     prop(data='context.scene.render', property='stamp_note_text', text='')
                 ]
             ]

Modified: trunk/blender/release/scripts/op/presets.py
===================================================================
--- trunk/blender/release/scripts/op/presets.py	2010-08-18 03:56:14 UTC (rev 31434)
+++ trunk/blender/release/scripts/op/presets.py	2010-08-18 04:10:23 UTC (rev 31435)
@@ -98,16 +98,16 @@
     name = AddPresetBase.name
 
     preset_values = [
-        "bpy.context.scene.render.resolution_x",
-        "bpy.context.scene.render.resolution_y",
+        "bpy.context.scene.render.field_order",
+        "bpy.context.scene.render.fps",
+        "bpy.context.scene.render.fps_base",
         "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",
+        "bpy.context.scene.render.resolution_x",
+        "bpy.context.scene.render.resolution_y",
+        "bpy.context.scene.render.use_fields",
+        "bpy.context.scene.render.use_fields_still",
     ]
 
     preset_subdir = "render"
@@ -145,12 +145,12 @@
     name = AddPresetBase.name
 
     preset_values = [
+        "bpy.context.cloth.settings.air_damping",
+        "bpy.context.cloth.settings.bending_stiffness",
+        "bpy.context.cloth.settings.mass",
         "bpy.context.cloth.settings.quality",
-        "bpy.context.cloth.settings.mass",
+        "bpy.context.cloth.settings.spring_damping",
         "bpy.context.cloth.settings.structural_stiffness",
-        "bpy.context.cloth.settings.bending_stiffness",
-        "bpy.context.cloth.settings.spring_damping",
-        "bpy.context.cloth.settings.air_damping",
     ]
 
     preset_subdir = "cloth"
@@ -163,19 +163,19 @@
     name = AddPresetBase.name
 
     preset_values = [
+        "bpy.context.object.data.sky.atmosphere_extinction",
+        "bpy.context.object.data.sky.atmosphere_inscattering",
         "bpy.context.object.data.sky.atmosphere_turbidity",
-        "bpy.context.object.data.sky.sky_blend_type",
-        "bpy.context.object.data.sky.sky_blend",
+        "bpy.context.object.data.sky.backscattered_light",
         "bpy.context.object.data.sky.horizon_brightness",
         "bpy.context.object.data.sky.spread",
-        "bpy.context.object.data.sky.sky_color_space",
-        "bpy.context.object.data.sky.sky_exposure",
         "bpy.context.object.data.sky.sun_brightness",
+        "bpy.context.object.data.sky.sun_intensity",
         "bpy.context.object.data.sky.sun_size",
-        "bpy.context.object.data.sky.backscattered_light",
-        "bpy.context.object.data.sky.sun_intensity",
-        "bpy.context.object.data.sky.atmosphere_inscattering",
-        "bpy.context.object.data.sky.atmosphere_extinction",
+        "bpy.context.object.data.sky.use_sky_blend",
+        "bpy.context.object.data.sky.use_sky_blend_type",
+        "bpy.context.object.data.sky.use_sky_color_space",
+        "bpy.context.object.data.sky.use_sky_exposure",
     ]
 
     preset_subdir = "sunsky"
@@ -191,14 +191,14 @@
     preset_values = [
         "bpy.context.user_preferences.edit.use_drag_immediately",
         "bpy.context.user_preferences.edit.use_insertkey_xyz_to_rgb",
+        "bpy.context.user_preferences.inputs.invert_mouse_wheel_zoom",
         "bpy.context.user_preferences.inputs.select_mouse",
-        "bpy.context.user_preferences.inputs.view_zoom_method",
-        "bpy.context.user_preferences.inputs.view_zoom_axis",
-        "bpy.context.user_preferences.inputs.view_rotate_method",
-        "bpy.context.user_preferences.inputs.invert_mouse_wheel_zoom",
         "bpy.context.user_preferences.inputs.use_emulate_numpad",
+        "bpy.context.user_preferences.inputs.use_mouse_continuous",
         "bpy.context.user_preferences.inputs.use_mouse_emulate_3_button",
-        "bpy.context.user_preferences.inputs.use_mouse_continuous",
+        "bpy.context.user_preferences.inputs.view_rotate_method",
+        "bpy.context.user_preferences.inputs.view_zoom_axis",
+        "bpy.context.user_preferences.inputs.view_zoom_method",
     ]
 
     preset_subdir = "interaction"

Modified: trunk/blender/release/scripts/op/screen_play_rendered_anim.py
===================================================================
--- trunk/blender/release/scripts/op/screen_play_rendered_anim.py	2010-08-18 03:56:14 UTC (rev 31434)
+++ trunk/blender/release/scripts/op/screen_play_rendered_anim.py	2010-08-18 04:10:23 UTC (rev 31435)
@@ -79,7 +79,7 @@
 
         preset = prefs.filepaths.animation_player_preset
         player_path = prefs.filepaths.animation_player
-        file_path = bpy.path.abspath(rd.output_path)
+        file_path = bpy.path.abspath(rd.filepath)
         is_movie = rd.is_movie_format
 
         # try and guess a command line if it doesn't exist

Modified: trunk/blender/release/scripts/ui/properties_data_lamp.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_lamp.py	2010-08-18 03:56:14 UTC (rev 31434)
+++ trunk/blender/release/scripts/ui/properties_data_lamp.py	2010-08-18 04:10:23 UTC (rev 31435)
@@ -125,7 +125,7 @@
     def draw(self, context):
         layout = self.layout
 
-        lamp = context.lamp.sky
+        lamp = context.lamp.use_sky
 
         row = layout.row(align=True)
         row.prop(lamp, "use_sky")
@@ -357,9 +357,9 @@
 
         col = split.column()
 
-        col.prop(lamp, "halo")
+        col.prop(lamp, "use_halo")
         sub = col.column(align=True)
-        sub.active = lamp.halo
+        sub.active = lamp.use_halo
         sub.prop(lamp, "halo_intensity", text="Intensity")
         if lamp.shadow_method == 'BUFFER_SHADOW':
             sub.prop(lamp, "halo_step", text="Step")

Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py	2010-08-18 03:56:14 UTC (rev 31434)
+++ trunk/blender/release/scripts/ui/properties_render.py	2010-08-18 04:10:23 UTC (rev 31435)
@@ -98,9 +98,9 @@
         col.prop(rl, "material_override", text="Material")
 
         col = split.column()
-        col.prop(rl, "visible_layers", text="Layer")
+        col.prop(rl, "layers", text="Layer")
         col.label(text="Mask Layers:")
-        col.prop(rl, "zmask_layers", text="")
+        col.prop(rl, "layers_zmask", text="")
 
 
         layout.separator()
@@ -109,21 +109,21 @@
         split = layout.split()
 
         col = split.column()
-        col.prop(rl, "zmask")
+        col.prop(rl, "use_zmask")
         row = col.row()
-        row.prop(rl, "zmask_negate", text="Negate")
-        row.active = rl.zmask
-        col.prop(rl, "all_z")
+        row.prop(rl, "invert_zmask", text="Negate")
+        row.active = rl.use_zmask
+        col.prop(rl, "use_all_z")
 
         col = split.column()
-        col.prop(rl, "solid")
-        col.prop(rl, "halo")
-        col.prop(rl, "ztransp")
+        col.prop(rl, "use_solid")
+        col.prop(rl, "use_halo")
+        col.prop(rl, "use_ztransp")
 
         col = split.column()

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list