rna renaming (manual edits)

13 files changed, 269 insertions, 135 deletions

diff --git a/release/scripts/op/animsys_update.py b/release/scripts/op/animsys_update.py
index 0ea13b24776..e3507dfae4a 100644
--- a/release/scripts/op/animsys_update.py
+++ b/release/scripts/op/animsys_update.py
@@ -522,7 +522,7 @@ data_path_update = [
     ("MaterialTextureSlot", "from_original", "use_from_original"),
     ("MaterialTextureSlot", "map_alpha", "use_map_alpha"),
     ("MaterialTextureSlot", "map_ambient", "use_map_ambient"),
-    ("MaterialTextureSlot", "map_colordiff", "use_map_color_diffuse"),
+    ("MaterialTextureSlot", "map_colordiff", "use_map_color_diff"),
     ("MaterialTextureSlot", "map_coloremission", "use_map_color_emission"),
     ("MaterialTextureSlot", "map_colorreflection", "use_map_color_reflection"),
     ("MaterialTextureSlot", "map_colorspec", "use_map_color_spec"),
@@ -555,6 +555,142 @@ data_path_update = [
     ("WorldLighting", "use_indirect_lighting", "use_indirect_light"),
     ("WorldStarsSettings", "color_randomization", "color_random"),
     ("WorldStarsSettings", "min_distance", "distance_min"),
+    ("WorldLighting", "falloff", "use_falloff"),
+    ("Constraint", "disabled", "is_valid"),
+    ("ClampToConstraint", "cyclic", "use_cyclic"),
+    ("ImageTexture", "filter", "filter_type"),
+    ("ImageTexture", "interpolation", "use_interpolation"),
+    ("ImageTexture", "mipmap", "use_mipmap"),
+    ("ImageUser", "frames", "frame_duration"),
+    ("ImageUser", "offset", "frame_offset"),
+    ("ImageUser", "cyclic", "use_cyclic"),
+    ("ArmatureModifier", "invert", "invert_vertex_group"),
+    ("ArmatureModifier", "quaternion", "use_deform_preserve_volume"),
+    ("ArrayModifier", "length", "fit_length"),
+    ("BevelModifier", "angle", "angle_limit"),
+    ("BuildModifier", "length", "frame_duration"),
+    ("BuildModifier", "randomize", "use_random_order"),
+    ("CastModifier", "x", "use_x"),
+    ("CastModifier", "y", "use_y"),
+    ("CastModifier", "z", "use_z"),
+    ("ExplodeModifier", "size", "use_size"),
+    ("MaskModifier", "invert", "invert_vertex_group"),
+    ("MeshDeformModifier", "invert", "invert_vertex_group"),
+    ("MeshDeformModifier", "dynamic", "use_dynamic_bind"),
+    ("MirrorModifier", "clip", "use_clip"),
+    ("MirrorModifier", "x", "use_x"),
+    ("MirrorModifier", "y", "use_y"),
+    ("MirrorModifier", "z", "use_z"),
+    ("ParticleInstanceModifier", "children", "use_children"),
+    ("ParticleInstanceModifier", "normal", "use_normal"),
+    ("ParticleInstanceModifier", "size", "use_size"),
+    ("ShrinkwrapModifier", "negative", "use_negative_direction"),
+    ("ShrinkwrapModifier", "positive", "use_positive_direction"),
+    ("ShrinkwrapModifier", "x", "use_project_x"),
+    ("ShrinkwrapModifier", "y", "use_project_y"),
+    ("ShrinkwrapModifier", "z", "use_project_z"),
+    ("ShrinkwrapModifier", "mode", "wrap_method"),
+    ("SimpleDeformModifier", "mode", "deform_method"),
+    ("SimpleDeformModifier", "relative", "use_relative"),
+    ("SmoothModifier", "repeat", "iterations"),
+    ("SmoothModifier", "x", "use_x"),
+    ("SmoothModifier", "y", "use_y"),
+    ("SmoothModifier", "z", "use_z"),
+    ("SolidifyModifier", "invert", "invert_vertex_group"),
+    ("WaveModifier", "cyclic", "use_cyclic"),
+    ("WaveModifier", "normals", "use_normal"),
+    ("WaveModifier", "x", "use_x"),
+    ("WaveModifier", "y", "use_y"),
+    ("DampedTrackConstraint", "track", "track_axis"),
+    ("FloorConstraint", "sticky", "use_sticky"),
+    ("FollowPathConstraint", "forward", "forward_axis"),
+    ("FollowPathConstraint", "up", "up_axis"),
+    ("LockedTrackConstraint", "lock", "lock_axis"),
+    ("LockedTrackConstraint", "track", "track_axis"),
+    ("MaintainVolumeConstraint", "axis", "free_axis"),
+    ("TrackToConstraint", "track", "track_axis"),
+    ("TrackToConstraint", "up", "up_axis"),
+    ("GameProperty", "debug", "show_debug"),
+    ("Image", "tiles", "use_tiles"),
+    ("Lamp", "diffuse", "use_diffuse"),
+    ("Lamp", "negative", "use_negative"),
+    ("Lamp", "layer", "use_own_layer"),
+    ("Lamp", "specular", "use_specular"),
+    ("AreaLamp", "dither", "use_dither"),
+    ("AreaLamp", "jitter", "use_jitter"),
+    ("SpotLamp", "square", "use_square"),
+    ("Material", "cubic", "use_cubic"),
+    ("Material", "shadows", "use_shadows"),
+    ("ParticleSettings", "amount", "count"),
+    ("ParticleSettings", "display", "draw_percentage"),
+    ("ParticleSettings", "velocity", "show_velocity"),
+    ("ParticleSettings", "trand", "use_emit_random"),
+    ("ParticleSettings", "parent", "use_parent_particles"),
+    ("ParticleSettings", "emitter", "use_render_emitter"),
+    ("ParticleSettings", "viewport", "use_simplify_viewport"),
+    ("Texture", "brightness", "intensity"),
+    ("CloudsTexture", "stype", "cloud_type"),
+    ("EnvironmentMapTexture", "filter", "filter_type"),
+    ("EnvironmentMapTexture", "mipmap", "use_mipmap"),
+    ("MarbleTexture", "stype", "marble_type"),
+    ("StucciTexture", "stype", "stucci_type"),
+    ("WoodTexture", "stype", "wood_type"),
+    ("World", "range", "color_range"),
+    ("World", "lighting", "light_settings"),
+    ("World", "mist", "mist_settings"),
+    ("World", "stars", "star_settings"),
+    ("MaterialHalo", "lines", "use_lines"),
+    ("MaterialHalo", "ring", "use_ring"),
+    ("MaterialHalo", "soft", "use_soft"),
+    ("MaterialHalo", "star", "use_star"),
+    ("MaterialHalo", "texture", "use_texture"),
+    ("MaterialPhysics", "damp", "damping"),
+    ("MaterialRaytraceTransparency", "limit", "depth_max"),
+    ("NlaStrip", "reversed", "use_reverse"),
+    ("CompositorNodeBlur", "bokeh", "use_bokeh"),
+    ("CompositorNodeBlur", "gamma", "use_gamma_correction"),
+    ("CompositorNodeBlur", "relative", "use_relative"),
+    ("CompositorNodeChannelMatte", "high", "limit_max"),
+    ("CompositorNodeChannelMatte", "low", "limit_min"),
+    ("CompositorNodeChannelMatte", "channel", "matte_channel"),
+    ("CompositorNodeChromaMatte", "cutoff", "threshold"),
+    ("CompositorNodeColorMatte", "h", "color_hue"),
+    ("CompositorNodeColorMatte", "s", "color_saturation"),
+    ("CompositorNodeColorMatte", "v", "color_value"),
+    ("CompositorNodeDBlur", "wrap", "use_wrap"),
+    ("CompositorNodeDefocus", "preview", "use_preview"),
+    ("CompositorNodeHueSat", "hue", "color_hue"),
+    ("CompositorNodeHueSat", "sat", "color_saturation"),
+    ("CompositorNodeHueSat", "val", "color_value"),
+    ("CompositorNodeImage", "frames", "frame_duration"),
+    ("CompositorNodeImage", "offset", "frame_offset"),
+    ("CompositorNodeImage", "start", "frame_start"),
+    ("CompositorNodeImage", "cyclic", "use_cyclic"),
+    ("CompositorNodeInvert", "alpha", "invert_alpha"),
+    ("CompositorNodeInvert", "rgb", "invert_rgb"),
+    ("CompositorNodeLensdist", "fit", "use_fit"),
+    ("CompositorNodeLensdist", "jitter", "use_jitter"),
+    ("CompositorNodeMixRGB", "alpha", "use_alpha"),
+    ("CompositorNodeRotate", "filter", "filter_type"),
+    ("CompositorNodeTime", "end", "frame_end"),
+    ("CompositorNodeTime", "start", "frame_start"),
+    ("CompositorNodeVecBlur", "curved", "use_curved"),
+    ("ShaderNodeExtendedMaterial", "diffuse", "use_diffuse"),
+    ("ShaderNodeExtendedMaterial", "specular", "use_specular"),
+    ("ShaderNodeMaterial", "diffuse", "use_diffuse"),
+    ("ShaderNodeMaterial", "specular", "use_specular"),
+    ("ShaderNodeMixRGB", "alpha", "use_alpha"),
+    ("TextureNodeCurveTime", "end", "frame_end"),
+    ("TextureNodeCurveTime", "start", "frame_start"),
+    ("TextureNodeMixRGB", "alpha", "use_alpha"),
+    ("TextureSlot", "negate", "invert"),
+    ("TextureSlot", "size", "scale"),
+    ("VertexPaint", "normals", "use_normal"),
+    ("SoftBodySettings", "damp", "damping"),
+    ("SequenceCrop", "right", "max_x"),
+    ("SequenceCrop", "top", "max_y"),
+    ("SequenceCrop", "bottom", "min_x"),
+    ("SequenceCrop", "left", "min_y"),
     ]
 
 
diff --git a/release/scripts/ui/properties_data_lamp.py b/release/scripts/ui/properties_data_lamp.py
index 8d82f5ef943..ce0d404434d 100644
--- a/release/scripts/ui/properties_data_lamp.py
+++ b/release/scripts/ui/properties_data_lamp.py
@@ -106,10 +106,10 @@ class DATA_PT_lamp(DataButtonsPanel, bpy.types.Panel):
             col.prop(lamp, "gamma")
 
         col = split.column()
-        col.prop(lamp, "negative")
-        col.prop(lamp, "layer", text="This Layer Only")
-        col.prop(lamp, "specular")
-        col.prop(lamp, "diffuse")
+        col.prop(lamp, "use_negative")
+        col.prop(lamp, "use_own_layer", text="This Layer Only")
+        col.prop(lamp, "use_specular")
+        col.prop(lamp, "use_diffuse")
 
 
 class DATA_PT_sunsky(DataButtonsPanel, bpy.types.Panel):
@@ -258,8 +258,8 @@ class DATA_PT_shadow(DataButtonsPanel, bpy.types.Panel):
                 col = split.column()
                 col = split.column()
                 col.prop(lamp, "use_umbra")
-                col.prop(lamp, "dither")
-                col.prop(lamp, "jitter")
+                col.prop(lamp, "use_dither")
+                col.prop(lamp, "use_jitter")
 
         elif lamp.shadow_method == 'BUFFER_SHADOW':
             col = layout.column()
@@ -352,7 +352,7 @@ class DATA_PT_spot(DataButtonsPanel, bpy.types.Panel):
         sub = col.column()
         sub.prop(lamp, "spot_size", text="Size")
         sub.prop(lamp, "spot_blend", text="Blend", slider=True)
-        col.prop(lamp, "square")
+        col.prop(lamp, "use_square")
         col.prop(lamp, "show_cone")
 
         col = split.column()
diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py
index e08c7cb1f23..8779c25100c 100644
--- a/release/scripts/ui/properties_data_modifier.py
+++ b/release/scripts/ui/properties_data_modifier.py
@@ -58,7 +58,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
         col.prop_object(md, "vertex_group", ob, "vertex_groups", text="")
         sub = col.column()
         sub.active = bool(md.vertex_group)
-        sub.prop(md, "invert")
+        sub.prop(md, "invert_vertex_group")
 
         split = layout.split()
 
@@ -69,7 +69,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
 
         col = split.column()
         col.label(text="Deformation:")
-        col.prop(md, "quaternion")
+        col.prop(md, "use_deform_preserve_volume")
         col.prop(md, "use_multi_modifier")
 
     def ARRAY(self, layout, ob, md):
@@ -78,7 +78,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
         if md.fit_type == 'FIXED_COUNT':
             layout.prop(md, "count")
         elif md.fit_type == 'FIT_LENGTH':
-            layout.prop(md, "length")
+            layout.prop(md, "fit_length")
         elif md.fit_type == 'FIT_CURVE':
             layout.prop(md, "curve")
 
@@ -131,7 +131,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
         layout.label(text="Limit Method:")
         layout.row().prop(md, "limit_method", expand=True)
         if md.limit_method == 'ANGLE':
-            layout.prop(md, "angle")
+            layout.prop(md, "angle_limit")
         elif md.limit_method == 'WEIGHT':
             layout.row().prop(md, "edge_weight_method", expand=True)
 
@@ -151,12 +151,12 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
 
         col = split.column()
         col.prop(md, "frame_start")
-        col.prop(md, "length")
+        col.prop(md, "frame_duration")
 
         col = split.column()
-        col.prop(md, "randomize")
+        col.prop(md, "use_random_order")
         sub = col.column()
-        sub.active = md.randomize
+        sub.active = md.use_random_order
         sub.prop(md, "seed")
 
     def CAST(self, layout, ob, md):
@@ -168,9 +168,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
         split = layout.split(percentage=0.25)
 
         col = split.column()
-        col.prop(md, "x")
-        col.prop(md, "y")
-        col.prop(md, "z")
+        col.prop(md, "use_x")
+        col.prop(md, "use_y")
+        col.prop(md, "use_z")
 
         col = split.column()
         col.prop(md, "factor")
@@ -267,7 +267,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
         col.prop(md, "show_unborn")
         col.prop(md, "show_alive")
         col.prop(md, "show_dead")
-        col.prop(md, "size")
+        col.prop(md, "use_size")
 
         layout.operator("object.explode_refresh", text="Refresh")
 
@@ -332,7 +332,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
 
         sub = col.column()
         sub.active = bool(md.vertex_group)
-        sub.prop(md, "invert")
+        sub.prop(md, "invert_vertex_group")
 
     def MESH_DEFORM(self, layout, ob, md):
         split = layout.split()
@@ -347,7 +347,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
 
         sub = col.column()
         sub.active = bool(md.vertex_group)
-        sub.prop(md, "invert")
+        sub.prop(md, "invert_vertex_group")
 
         layout.separator()
 
@@ -362,7 +362,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
             col.prop(md, "precision")
 
             col = split.column()
-            col.prop(md, "dynamic")
+            col.prop(md, "use_dynamic_bind")
 
     def MIRROR(self, layout, ob, md):
         layout.prop(md, "merge_threshold")
@@ -370,13 +370,13 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
 
         col = split.column()
         col.label(text="Axis:")
-        col.prop(md, "x")
-        col.prop(md, "y")
-        col.prop(md, "z")
+        col.prop(md, "use_x")
+        col.prop(md, "use_y")
+        col.prop(md, "use_z")
 
         col = split.column()
         col.label(text="Options:")
-        col.prop(md, "clip", text="Clipping")
+        col.prop(md, "use_clip", text="Clipping")
         col.prop(md, "use_mirror_vertex_groups", text="Vertex Groups")
 
         col = split.column()
@@ -425,9 +425,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
         split = layout.split()
         col = split.column()
         col.label(text="Create From:")
-        col.prop(md, "normal")
-        col.prop(md, "children")
-        col.prop(md, "size")
+        col.prop(md, "use_normal")
+        col.prop(md, "use_children")
+        col.prop(md, "use_size")
 
         col = split.column()
         col.label(text="Show Particles When:")
@@ -490,7 +490,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
 
         col = split.column()
         col.label(text="Mode:")
-        col.prop(md, "mode", text="")
+        col.prop(md, "wrap_method", text="")
 
         split = layout.split(percentage=0.25)
 
@@ -498,14 +498,14 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
 
         if md.mode == 'PROJECT':
             col.label(text="Axis:")
-            col.prop(md, "x")
-            col.prop(md, "y")
-            col.prop(md, "z")
+            col.prop(md, "use_project_x")
+            col.prop(md, "use_project_y")
+            col.prop(md, "use_project_z")
 
             col = split.column()
             col.label(text="Direction:")
-            col.prop(md, "negative")
-            col.prop(md, "positive")
+            col.prop(md, "use_negative_direction")
+            col.prop(md, "use_positive_direction")
 
             col = split.column()
 
@@ -524,7 +524,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
 
         col = split.column()
         col.label(text="Mode:")
-        col.prop(md, "mode", text="")
+        col.prop(md, "deform_method", text="")
 
         col = split.column()
         col.label(text="Vertex Group:")
@@ -536,8 +536,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
         col.label(text="Origin:")
         col.prop(md, "origin", text="")
         sub = col.column()
-        sub.active = (md.origin != "")
-        sub.prop(md, "relative")
+        sub.active = (md.origin is not None)
+        sub.prop(md, "use_relative")
 
         col = split.column()
         col.label(text="Deform:")
@@ -555,13 +555,13 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
 
         col = split.column()
         col.label(text="Axis:")
-        col.prop(md, "x")
-        col.prop(md, "y")
-        col.prop(md, "z")
+        col.prop(md, "use_x")
+        col.prop(md, "use_y")
+        col.prop(md, "use_z")
 
         col = split.column()
         col.prop(md, "factor")
-        col.prop(md, "repeat")
+        col.prop(md, "iterations")
         col.label(text="Vertex Group:")
         col.prop_object(md, "vertex_group", ob, "vertex_groups", text="")
 
@@ -585,8 +585,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
 
         col.prop(md, "offset")
         colsub = col.column()
-        colsub.active = (md.vertex_group is not "")
-        colsub.prop(md, "invert", text="Invert")
+        colsub.active = bool(md.vertex_group)
+        colsub.prop(md, "invert_vertex_group", text="Invert")
 
         col.prop(md, "use_even_offset")
         col.prop(md, "use_quality_normals")
@@ -596,10 +596,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
         colsub.active = md.use_rim
         colsub.prop(md, "use_rim_material")
 
-        # col = layout.column()
-        # col.label(text="Vertex Group:")
-        # col.prop_object(md, "vertex_group", ob, "vertex_groups", text="")
-
     def SUBSURF(self, layout, ob, md):
         layout.row().prop(md, "subdivision_type", expand=True)
 
@@ -650,12 +646,12 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
 
         col = split.column()
         col.label(text="Motion:")
-        col.prop(md, "x")
-        col.prop(md, "y")
-        col.prop(md, "cyclic")
+        col.prop(md, "use_x")
+        col.prop(md, "use_y")
+        col.prop(md, "use_cyclic")
 
         col = split.column()
-        col.prop(md, "normals")
+        col.prop(md, "use_normal")
         sub = col.column()
         sub.active = md.normals
         sub.prop(md, "use_normal_x", text="X")
diff --git a/release/scripts/ui/properties_material.py b/release/scripts/ui/properties_material.py
index d4e07f8333b..265f7e08d3a 100644
--- a/release/scripts/ui/properties_material.py
+++ b/release/scripts/ui/properties_material.py
@@ -292,7 +292,7 @@ class MATERIAL_PT_shading(MaterialButtonsPanel, bpy.types.Panel):
             sub = col.column()
             sub.active = not mat.use_shadeless
             sub.prop(mat, "use_tangent_shading")
-            sub.prop(mat, "cubic")
+            sub.prop(mat, "use_cubic")
 
         elif mat.type == 'HALO':
             layout.prop(mat, "alpha")
@@ -348,7 +348,7 @@ class MATERIAL_PT_transp(MaterialButtonsPanel, bpy.types.Panel):
             col.prop(rayt, "ior")
             col.prop(rayt, "filter")
             col.prop(rayt, "falloff")
-            col.prop(rayt, "limit")
+            col.prop(rayt, "depth_max")
             col.prop(rayt, "depth")
 
             col = split.column()
@@ -493,28 +493,28 @@ class MATERIAL_PT_halo(MaterialButtonsPanel, bpy.types.Panel):
         col.prop(halo, "hardness")
         col.prop(halo, "add")
         col.label(text="Options:")
-        col.prop(halo, "texture")
+        col.prop(halo, "use_texture")
         col.prop(halo, "use_vertex_normal")
         col.prop(halo, "use_extreme_alpha")
-        col.prop(halo, "shaded")
-        col.prop(halo, "soft")
+        col.prop(halo, "use_shaded")
+        col.prop(halo, "use_soft")
 
         col = split.column()
-        col.prop(halo, "ring")
+        col.prop(halo, "use_ring")
         sub = col.column()
-        sub.active = halo.ring
+        sub.active = halo.use_ring
         sub.prop(halo, "ring_count")
         sub.prop(mat, "mirror_color", text="")
         col.separator()
-        col.prop(halo, "lines")
+        col.prop(halo, "use_lines")
         sub = col.column()
-        sub.active = halo.lines
+        sub.active = halo.use_lines
         sub.prop(halo, "line_count", text="Lines")
         sub.prop(mat, "specular_color", text="")
         col.separator()
-        col.prop(halo, "star")
+        col.prop(halo, "use_star")
         sub = col.column()
-        sub.active = halo.star
+        sub.active = halo.use_star
         sub.prop(halo, "star_tip_count")
 
 
@@ -576,7 +576,7 @@ class MATERIAL_PT_physics(MaterialButtonsPanel, bpy.types.Panel):
         col = split.column()
         col.prop(phys, "force", slider=True)
         col.prop(phys, "elasticity", slider=True)
-        col.prop(phys, "damp", slider=True)
+        col.prop(phys, "damping", slider=True)
 
 
 class MATERIAL_PT_strand(MaterialButtonsPanel, bpy.types.Panel):
@@ -690,7 +690,7 @@ class MATERIAL_PT_shadow(MaterialButtonsPanel, bpy.types.Panel):
         split = layout.split()
 
         col = split.column()
-        col.prop(mat, "shadows", text="Receive")
+        col.prop(mat, "use_shadows", text="Receive")
         col.prop(mat, "use_transparent_shadows", text="Receive Transparent")
         col.prop(mat, "use_only_shadow", text="Shadows Only")
         col.prop(mat, "use_cast_shadows_only", text="Cast Only")
diff --git a/release/scripts/ui/properties_object_constraint.py b/release/scripts/ui/properties_object_constraint.py
index be102a17103..aca05433d9a 100644
--- a/release/scripts/ui/properties_object_constraint.py
+++ b/release/scripts/ui/properties_object_constraint.py
@@ -125,12 +125,12 @@ class ConstraintButtonsPanel():
 
         row = layout.row()
         row.label(text="To:")
-        row.prop(con, "track", expand=True)
+        row.prop(con, "track_axis", expand=True)
 
         split = layout.split()
 
         col = split.column()
-        col.prop(con, "up", text="Up")
+        col.prop(con, "up_axis", text="Up")
 
         col = split.column()
         col.prop(con, "use_target_z")
@@ -234,10 +234,10 @@ class ConstraintButtonsPanel():
 
         row = layout.row()
         row.label(text="Forward:")
-        row.prop(con, "forward", expand=True)
+        row.prop(con, "forward_axis", expand=True)
 
         row = layout.row()
-        row.prop(con, "up", text="Up")
+        row.prop(con, "up_axis", text="Up")
         row.label()
 
     def LIMIT_ROTATION(self, context, layout, con):
@@ -425,7 +425,7 @@ class ConstraintButtonsPanel():
 
         row = layout.row()
         row.label(text="Free:")
-        row.prop(con, "axis", expand=True)
+        row.prop(con, "free_axis", expand=True)
 
         layout.prop(con, "volume")
 
@@ -466,11 +466,11 @@ class ConstraintButtonsPanel():
 
         row = layout.row()
         row.label(text="To:")
-        row.prop(con, "track", expand=True)
+        row.prop(con, "track_axis", expand=True)
 
         row = layout.row()
         row.label(text="Lock:")
-        row.prop(con, "lock", expand=True)
+        row.prop(con, "lock_axis", expand=True)
 
     def LIMIT_DISTANCE(self, context, layout, con):
         self.target_template(layout, con)
@@ -510,7 +510,7 @@ class ConstraintButtonsPanel():
         split = layout.split()
 
         col = split.column()
-        col.prop(con, "sticky")
+        col.prop(con, "use_sticky")
 
         col = split.column()
         col.prop(con, "use_rotation")
@@ -561,7 +561,7 @@ class ConstraintButtonsPanel():
         row.prop(con, "main_axis", expand=True)
 
         row = layout.row()
-        row.prop(con, "cyclic")
+        row.prop(con, "use_cyclic")
 
     def TRANSFORM(self, context, layout, con):
         self.target_template(layout, con)
@@ -640,7 +640,7 @@ class ConstraintButtonsPanel():
 
         row = layout.row()
         row.label(text="To:")
-        row.prop(con, "track", expand=True)
+        row.prop(con, "track_axis", expand=True)
 
     def SPLINE_IK(self, context, layout, con):
         self.target_template(layout, con)
diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py
index 65070772d09..8d62385be46 100644
--- a/release/scripts/ui/properties_particle.py
+++ b/release/scripts/ui/properties_particle.py
@@ -157,7 +157,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel):
 
         row = layout.row()
         row.active = part.distribution != 'GRID'
-        row.prop(part, "amount")
+        row.prop(part, "count")
 
         if part.type != 'HAIR':
             split = layout.split()
@@ -176,7 +176,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel):
         row.prop(part, "emit_from", expand=True)
 
         row = layout.row()
-        row.prop(part, "trand")
+        row.prop(part, "use_emit_random")
         if part.distribution != 'GRID':
             row.prop(part, "use_even_distribution")
 
@@ -689,8 +689,8 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel):
         split = layout.split()
 
         sub = split.column()
-        sub.prop(part, "emitter")
-        sub.prop(part, "parent")
+        sub.prop(part, "use_render_emitter")
+        sub.prop(part, "use_parent_particles")
         sub = split.column()
         sub.prop(part, "show_unborn")
         sub.prop(part, "use_dead")
@@ -739,7 +739,7 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel):
                     row.prop(part, "simplify_rate")
                     row.prop(part, "simplify_transition")
                     row = layout.row()
-                    row.prop(part, "viewport")
+                    row.prop(part, "use_simplify_viewport")
                     sub = row.row()
                     sub.active = part.viewport == True
                     sub.prop(part, "simplify_viewport")
@@ -856,7 +856,7 @@ class PARTICLE_PT_draw(ParticleButtonsPanel, bpy.types.Panel):
         path = (part.render_type == 'PATH' and part.draw_method == 'RENDER') or part.draw_method == 'PATH'
 
         row = layout.row()
-        row.prop(part, "display", slider=True)
+        row.prop(part, "draw_percentage", slider=True)
         if part.draw_method != 'RENDER' or part.render_type == 'HALO':
             row.prop(part, "draw_size")
         else:
@@ -865,7 +865,7 @@ class PARTICLE_PT_draw(ParticleButtonsPanel, bpy.types.Panel):
         row = layout.row()
         col = row.column()
         col.prop(part, "show_size")
-        col.prop(part, "velocity")
+        col.prop(part, "show_velocity")
         col.prop(part, "show_number")
         if part.physics_type == 'BOIDS':
             col.prop(part, "show_health")
diff --git a/release/scripts/ui/properties_physics_softbody.py b/release/scripts/ui/properties_physics_softbody.py
index 865003531db..3722182caa1 100644
--- a/release/scripts/ui/properties_physics_softbody.py
+++ b/release/scripts/ui/properties_physics_softbody.py
@@ -169,7 +169,7 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel, bpy.types.Panel):
         col.label(text="Springs:")
         col.prop(softbody, "pull")
         col.prop(softbody, "push")
-        col.prop(softbody, "damp")
+        col.prop(softbody, "damping")
         col.prop(softbody, "plastic")
         col.prop(softbody, "bend")
         col.prop(softbody, "spring_length", text="Length")
diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py
index c6c6689a3d9..474f4a75df7 100644
--- a/release/scripts/ui/properties_texture.py
+++ b/release/scripts/ui/properties_texture.py
@@ -180,7 +180,7 @@ class TEXTURE_PT_colors(TextureButtonsPanel, bpy.types.Panel):
 
         col = split.column()
         col.label(text="Adjust:")
-        col.prop(tex, "brightness")
+        col.prop(tex, "intensity")
         col.prop(tex, "contrast")
         col.prop(tex, "saturation")
 
@@ -289,7 +289,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, bpy.types.Panel):
 
         col = split.column()
 
-        col.prop(tex, "size")
+        col.prop(tex, "scale")
 
 
 class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel):
@@ -331,7 +331,7 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel):
                 col = split.column()
                 col.label(text="Diffuse:")
                 factor_but(col, tex.use_map_diffuse, "use_map_diffuse", "diffuse_factor", "Intensity")
-                factor_but(col, tex.use_map_color_diff, "use_map_color_diffuse", "diffuse_color_factor", "Color")
+                factor_but(col, tex.use_map_color_diffuse, "use_map_color_diffuse", "diffuse_color_factor", "Color")
                 factor_but(col, tex.use_map_alpha, "use_map_alpha", "alpha_factor", "Alpha")
                 factor_but(col, tex.use_map_translucency, "use_map_translucency", "translucency_factor", "Translucency")
 
@@ -403,7 +403,7 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel):
         sub.prop(tex, "color", text="")
 
         col = split.column()
-        col.prop(tex, "negate", text="Negative")
+        col.prop(tex, "invert", text="Negative")
         col.prop(tex, "use_stencil")
 
         if type(idblock) in (bpy.types.Material, bpy.types.World):
@@ -431,7 +431,7 @@ class TEXTURE_PT_clouds(TextureTypePanel, bpy.types.Panel):
 
         tex = context.texture
 
-        layout.prop(tex, "stype", expand=True)
+        layout.prop(tex, "cloud_type", expand=True)
         layout.label(text="Noise:")
         layout.prop(tex, "noise_type", text="Type", expand=True)
         layout.prop(tex, "noise_basis", text="Basis")
@@ -457,16 +457,16 @@ class TEXTURE_PT_wood(TextureTypePanel, bpy.types.Panel):
         tex = context.texture
 
         layout.prop(tex, "noisebasis_2", expand=True)
-        layout.prop(tex, "stype", expand=True)
+        layout.prop(tex, "wood_type", expand=True)
 
         col = layout.column()
-        col.active = tex.stype in ('RINGNOISE', 'BANDNOISE')
+        col.active = tex.wood_type in ('RINGNOISE', 'BANDNOISE')
         col.label(text="Noise:")
         col.row().prop(tex, "noise_type", text="Type", expand=True)
         layout.prop(tex, "noise_basis", text="Basis")
 
         split = layout.split()
-        split.active = tex.stype in ('RINGNOISE', 'BANDNOISE')
+        split.active = tex.wood_type in ('RINGNOISE', 'BANDNOISE')
 
         col = split.column()
         col.prop(tex, "noise_scale", text="Size")
@@ -486,7 +486,7 @@ class TEXTURE_PT_marble(TextureTypePanel, bpy.types.Panel):
 
         tex = context.texture
 
-        layout.prop(tex, "stype", expand=True)
+        layout.prop(tex, "marble_type", expand=True)
         layout.prop(tex, "noisebasis_2", expand=True)
         layout.label(text="Noise:")
         layout.prop(tex, "noise_type", text="Type", expand=True)
@@ -550,7 +550,7 @@ class TEXTURE_PT_stucci(TextureTypePanel, bpy.types.Panel):
 
         tex = context.texture
 
-        layout.prop(tex, "stype", expand=True)
+        layout.prop(tex, "stucci_type", expand=True)
         layout.label(text="Noise:")
         layout.prop(tex, "noise_type", text="Type", expand=True)
         layout.prop(tex, "noise_basis", text="Basis")
@@ -579,8 +579,8 @@ class TEXTURE_PT_image(TextureTypePanel, bpy.types.Panel):
 
 def texture_filter_common(tex, layout):
     layout.label(text="Filter:")
-    layout.prop(tex, "filter", text="")
-    if tex.mipmap and tex.filter in ('AREA', 'EWA', 'FELINE'):
+    layout.prop(tex, "filter_type", text="")
+    if tex.use_mipmap and tex.filter_type in ('AREA', 'EWA', 'FELINE'):
         if tex.filter == 'FELINE':
             layout.prop(tex, "filter_probes", text="Probes")
         else:
@@ -619,11 +619,11 @@ class TEXTURE_PT_image_sampling(TextureTypePanel, bpy.types.Panel):
         row.active = tex.use_normal_map
         row.prop(tex, "normal_space", text="")
 
-        col.prop(tex, "mipmap")
+        col.prop(tex, "use_mipmap")
         row = col.row()
-        row.active = tex.mipmap
+        row.active = tex.use_mipmap
         row.prop(tex, "use_mipmap_gauss")
-        col.prop(tex, "interpolation")
+        col.prop(tex, "use_interpolation")
 
         texture_filter_common(tex, col)
 
@@ -863,11 +863,11 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel, bpy.types.Panel):
         elif vd.file_format == 'IMAGE_SEQUENCE':
             layout.template_ID(tex, "image", open="image.open")
             layout.template_image(tex, "image", tex.image_user, compact=True)
-            #layout.prop(vd, "frames")
+            #layout.prop(vd, "frame_duration")
 
-        layout.prop(vd, "still")
+        layout.prop(vd, "use_still_frame")
         row = layout.row()
-        row.active = vd.still
+        row.active = vd.use_still_frame
         row.prop(vd, "still_frame")
 
         layout.prop(vd, "interpolation")
diff --git a/release/scripts/ui/properties_world.py b/release/scripts/ui/properties_world.py
index f9906fa628e..a42516a63b4 100644
--- a/release/scripts/ui/properties_world.py
+++ b/release/scripts/ui/properties_world.py
@@ -20,6 +20,8 @@
 import bpy
 from rna_prop_ui import PropertyPanel
 
+# TODO, "color_range" not in the UI
+
 
 class WorldButtonsPanel():
     bl_space_type = 'PROPERTIES'
@@ -95,12 +97,12 @@ class WORLD_PT_ambient_occlusion(WorldButtonsPanel, bpy.types.Panel):
     COMPAT_ENGINES = {'BLENDER_RENDER'}
 
     def draw_header(self, context):
-        light = context.world.lighting
+        light = context.world.light_settings
         self.layout.prop(light, "use_ambient_occlusion", text="")
 
     def draw(self, context):
         layout = self.layout
-        light = context.world.lighting
+        light = context.world.light_settings
 
         layout.active = light.use_ambient_occlusion
 
@@ -114,12 +116,12 @@ class WORLD_PT_environment_lighting(WorldButtonsPanel, bpy.types.Panel):
     COMPAT_ENGINES = {'BLENDER_RENDER'}
 
     def draw_header(self, context):
-        light = context.world.lighting
+        light = context.world.light_settings
         self.layout.prop(light, "use_environment_light", text="")
 
     def draw(self, context):
         layout = self.layout
-        light = context.world.lighting
+        light = context.world.light_settings
 
         layout.active = light.use_environment_light
 
@@ -134,16 +136,16 @@ class WORLD_PT_indirect_lighting(WorldButtonsPanel, bpy.types.Panel):
 
     @classmethod
     def poll(cls, context):
-        light = getattr(context.world, "lighting", None)
+        light = getattr(context.world, "light_settings", None)
         return light and light.gather_method == 'APPROXIMATE'
 
     def draw_header(self, context):
-        light = context.world.lighting
+        light = context.world.light_settings
         self.layout.prop(light, "use_indirect_light", text="")
 
     def draw(self, context):
         layout = self.layout
-        light = context.world.lighting
+        light = context.world.light_settings
 
         layout.active = light.use_indirect_light
 
@@ -158,7 +160,7 @@ class WORLD_PT_gather(WorldButtonsPanel, bpy.types.Panel):
 
     def draw(self, context):
         layout = self.layout
-        light = context.world.lighting
+        light = context.world.light_settings
 
         layout.active = light.use_ambient_occlusion or light.use_environment_light or light.use_indirect_light
 
@@ -170,9 +172,9 @@ class WORLD_PT_gather(WorldButtonsPanel, bpy.types.Panel):
         col.label(text="Attenuation:")
         if light.gather_method == 'RAYTRACE':
             col.prop(light, "distance")
-        col.prop(light, "falloff")
+        col.prop(light, "use_falloff")
         sub = col.row()
-        sub.active = light.falloff
+        sub.active = light.use_falloff
         sub.prop(light, "falloff_strength", text="Strength")
 
         if light.gather_method == 'RAYTRACE':
@@ -208,25 +210,25 @@ class WORLD_PT_mist(WorldButtonsPanel, bpy.types.Panel):
     def draw_header(self, context):
         world = context.world
 
-        self.layout.prop(world.mist, "use_mist", text="")
+        self.layout.prop(world.mist_settings, "use_mist", text="")
 
     def draw(self, context):
         layout = self.layout
         world = context.world
 
-        layout.active = world.mist.use_mist
+        layout.active = world.mist_settings.use_mist
 
         split = layout.split()
 
         col = split.column()
-        col.prop(world.mist, "intensity", slider=True)
-        col.prop(world.mist, "start")
+        col.prop(world.mist_settings, "intensity", slider=True)
+        col.prop(world.mist_settings, "start")
 
         col = split.column()
-        col.prop(world.mist, "depth")
-        col.prop(world.mist, "height")
+        col.prop(world.mist_settings, "depth")
+        col.prop(world.mist_settings, "height")
 
-        layout.prop(world.mist, "falloff")
+        layout.prop(world.mist_settings, "falloff")
 
 
 class WORLD_PT_stars(WorldButtonsPanel, bpy.types.Panel):
@@ -237,23 +239,23 @@ class WORLD_PT_stars(WorldButtonsPanel, bpy.types.Panel):
     def draw_header(self, context):
         world = context.world
 
-        self.layout.prop(world.stars, "use_stars", text="")
+        self.layout.prop(world.star_settings, "use_stars", text="")
 
     def draw(self, context):
         layout = self.layout
         world = context.world
 
-        layout.active = world.stars.use_stars
+        layout.active = world.star_settings.use_stars
 
         split = layout.split()
 
         col = split.column()
-        col.prop(world.stars, "size")
-        col.prop(world.stars, "color_random", text="Colors")
+        col.prop(world.star_settings, "size")
+        col.prop(world.star_settings, "color_random", text="Colors")
 
         col = split.column()
-        col.prop(world.stars, "distance_min", text="Min. Dist")
-        col.prop(world.stars, "average_separation", text="Separation")
+        col.prop(world.star_settings, "distance_min", text="Min. Dist")
+        col.prop(world.star_settings, "average_separation", text="Separation")
 
 
 class WORLD_PT_custom_props(WorldButtonsPanel, PropertyPanel, bpy.types.Panel):
diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py
index 891637e7121..11324b59b3b 100644
--- a/release/scripts/ui/space_image.py
+++ b/release/scripts/ui/space_image.py
@@ -389,7 +389,7 @@ class IMAGE_PT_game_properties(bpy.types.Panel):
         subsub.prop(ima, "frame_end", text="End")
         subsub.prop(ima, "fps", text="Speed")
 
-        col.prop(ima, "tiles")
+        col.prop(ima, "use_tiles")
         sub = col.column(align=True)
         sub.active = ima.tiles or ima.use_animation
         sub.prop(ima, "tiles_x", text="X")
diff --git a/release/scripts/ui/space_logic.py b/release/scripts/ui/space_logic.py
index f2d99c6e447..1272a5db9d1 100644
--- a/release/scripts/ui/space_logic.py
+++ b/release/scripts/ui/space_logic.py
@@ -45,7 +45,7 @@ class LOGIC_PT_properties(bpy.types.Panel):
             row.prop(prop, "name", text="")
             row.prop(prop, "type", text="")
             row.prop(prop, "value", text="", toggle=True) # we dont care about the type. rna will display correctly
-            row.prop(prop, "debug", text="", toggle=True, icon='INFO')
+            row.prop(prop, "show_debug", text="", toggle=True, icon='INFO')
             row.operator("object.game_property_remove", text="", icon='X', emboss=False).index = i
 
 
diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py
index 1906f3312e1..ec607629757 100644
--- a/release/scripts/ui/space_sequencer.py
+++ b/release/scripts/ui/space_sequencer.py
@@ -476,10 +476,10 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, bpy.types.Panel):
         layout.prop(strip, "use_crop", text="Image Crop:")
         if strip.use_crop:
             col = layout.column(align=True)
-            col.prop(strip.crop, "top")
-            col.prop(strip.crop, "left")
-            col.prop(strip.crop, "bottom")
-            col.prop(strip.crop, "right")
+            col.prop(strip.crop, "max_y")
+            col.prop(strip.crop, "min_x")
+            col.prop(strip.crop, "min_y")
+            col.prop(strip.crop, "max_x")
 
     def draw_panel_transform(self, strip):
         layout = self.layout
@@ -576,10 +576,10 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, bpy.types.Panel):
         layout.prop(strip, "use_crop", text="Image Crop:")
         if strip.use_crop:
             col = layout.column(align=True)
-            col.prop(strip.crop, "top")
-            col.prop(strip.crop, "left")
-            col.prop(strip.crop, "bottom")
-            col.prop(strip.crop, "right")
+            col.prop(strip.crop, "max_y")
+            col.prop(strip.crop, "min_x")
+            col.prop(strip.crop, "min_y")
+            col.prop(strip.crop, "max_x")
 
         col = layout.column(align=True)
         col.label(text="Trim Duration:")
diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py
index e47dbceed8f..ddd0998f4c6 100644
--- a/release/scripts/ui/space_view3d_toolbar.py
+++ b/release/scripts/ui/space_view3d_toolbar.py
@@ -1155,7 +1155,7 @@ class VIEW3D_PT_tools_vertexpaint(View3DPanel, bpy.types.Panel):
         col = layout.column()
         #col.prop(vpaint, "mode", text="")
         col.prop(vpaint, "use_all_faces")
-        col.prop(vpaint, "normals")
+        col.prop(vpaint, "use_normal")
         col.prop(vpaint, "use_spray")
 
         col.label(text="Unified Settings:")