merged rna names with newly created dump from rna_info.py

2 files changed, 74 insertions, 73 deletions

diff --git a/source/blender/makesrna/rna_cleanup/rna_cleaner.py b/source/blender/makesrna/rna_cleanup/rna_cleaner.py
index 24b4db99e7a..ed483deb889 100755
--- a/source/blender/makesrna/rna_cleanup/rna_cleaner.py
+++ b/source/blender/makesrna/rna_cleanup/rna_cleaner.py
@@ -8,7 +8,7 @@ Typical line in the input file (elements in [] are optional).
 [comment *] ToolSettings.snap_align_rotation -> use_snap_align_rotation:    boolean    [Align rotation with the snapping target]
 
 Geterate output format from blender run this:
- ./blender.bin --background --python ./release/scripts/modules/rna_info.py > source/blender/makesrna/rna_cleanup/out.txt
+ ./blender.bin --background --python ./release/scripts/modules/rna_info.py 2> source/blender/makesrna/rna_cleanup/out.txt
 """
 
 
diff --git a/source/blender/makesrna/rna_cleanup/rna_properties.txt b/source/blender/makesrna/rna_cleanup/rna_properties.txt
index aab4425699f..9a3c7b3e18c 100644
--- a/source/blender/makesrna/rna_cleanup/rna_properties.txt
+++ b/source/blender/makesrna/rna_cleanup/rna_properties.txt
@@ -364,8 +364,8 @@ MAKE PROPERTY OF A COLLECTION * Area.active_space -> active_space:   pointer,  "
 + * ColorRamp.interpolation -> interpolation:   enum  "NO DESCRIPTION"
 + * ColorRampElement.color -> color:   float  "NO DESCRIPTION"
 + * ColorRampElement.position -> position:   float  "NO DESCRIPTION"
+ConsoleLine.body -> body:   string  "Text in the line"
 + * ConsoleLine.current_character -> current_character:   int  "NO DESCRIPTION"
-+ * ConsoleLine.line -> line:   string  "Text in the line"
 + * Constraint.active -> active:   boolean  "Constraint is the one being edited"
 + * Constraint.lin_error -> error_location:   float,  "(read-only)    Amount of residual error in Blender space unit for constraints that work on position"
 + * Constraint.rot_error -> error_rotation:   float,  "(read-only)    Amount of residual error in radiant for constraints that work on orientation"
@@ -621,6 +621,7 @@ MAKE PROPERTY OF A COLLECTION * Area.active_space -> active_space:   pointer,  "
 + * CurveMapping.curves -> curves:   collection,  "(read-only)"
 + * CurveMapping.clip -> use_clip:   boolean  "Force the curve view to fit a defined boundary"
 + * CurveMapping.white_level -> white_level:   float  "For RGB curves, the color that white is mapped to"
+TODO MOVE TO COLLECTION * CurveSplines.active -> active:   pointer  "Active curve spline"
 + * DopeSheet.filtering_group -> filter_group:   pointer  "Group that included Object should be a member of"
 + * DopeSheet.display_armature -> show_armatures:   boolean  "Include visualization of Armature related Animation data"
 + * DopeSheet.display_camera -> show_cameras:   boolean  "Include visualization of Camera related Animation data"
@@ -1104,8 +1105,8 @@ REMOVE * FModifier.active -> active:   boolean  "F-Curve Modifier is the one bei
 + * ID|Brush.strength -> strength:   float  "The amount of pressure on the brush"
 + * ID|Brush.stroke_method -> stroke_method:   enum  "NO DESCRIPTION"
 + * ID|Brush.texture -> texture:   pointer  "NO DESCRIPTION"
+ID|Brush.texture_angle_source_no_random -> texture_angle_source_no_random:   enum  "NO DESCRIPTION"
 + * ID|Brush.texture_angle_source -> texture_angle_source_random:   enum  "NO DESCRIPTION"
-+ * ID|Brush.texture_angle_source -> texture_angle_source_no_random:   enum  "NO DESCRIPTION"
 + * ID|Brush.texture_overlay_alpha -> texture_overlay_alpha:   int  "NO DESCRIPTION"
 + * ID|Brush.texture_sample_bias -> texture_sample_bias:   float  "Value added to texture samples"
 + * ID|Brush.texture_slot -> texture_slot:   pointer,  "(read-only)"
@@ -1180,7 +1181,7 @@ REMOVE * FModifier.active -> active:   boolean  "F-Curve Modifier is the one bei
 + * ID|Curve.draw_normals -> show_normals:   boolean  "Display 3D curve normals in editmode"
 + * ID|Curve.splines -> splines:   collection,  "(read-only)    Collection of splines in this curve data object"
 + * ID|Curve.taper_object -> taper_object:   pointer  "Curve object name that defines the taper (width)"
-+ * ID|Curve.texspace_location -> texspace_location:   float  "Texture space location"
+ID|Curve.texspace_loc -> texspace_location:   float  "Texture space location"
 + * ID|Curve.texspace_size -> texspace_size:   float  "Texture space size"
 + * ID|Curve.twist_mode -> twist_mode:   enum  "The type of tilt calculation for 3D Curves"
 + * ID|Curve.twist_smooth -> twist_smooth:   float  "Smoothing iteration for tangents"
@@ -1223,9 +1224,6 @@ MAKE COLLECTION ATTR * ID|Curve|TextCurve.active_textbox -> active_textbox:   in
 + * ID|Group.dupli_offset -> dupli_offset:   float  "Offset from the origin to use when instancing as DupliGroup"
 + * ID|Group.layer -> layers:   boolean  "Layers visible when this groups is instanced as a dupli"
 + * ID|Group.objects -> objects:   collection,  "(read-only)    A collection of this groups objects"
-+ * ID|Image.animation_end -> frame_end:   int  "End frame of an animated texture"
-+ * ID|Image.animation_speed -> fps:   int  "Speed of the animation in frames per second"
-+ * ID|Image.animation_start -> frame_start:   int  "Start frame of an animated texture"
 + * ID|Image.bindcode -> bindcode:   int,  "(read-only)    OpenGL bindcode"
 + * ID|Image.depth -> depth:   int,  "(read-only)    Image bit depth"
 + * ID|Image.display_aspect -> display_aspect:   float  "Display Aspect for this image, does not affect rendering"
@@ -1233,6 +1231,9 @@ MAKE COLLECTION ATTR * ID|Curve|TextCurve.active_textbox -> active_textbox:   in
 + * ID|Image.file_format -> file_format:   enum  "Format used for re-saving this file"
 + * ID|Image.filepath -> filepath:   string  "Image/Movie file name"
 + * ID|Image.filepath_raw -> filepath_raw:   string  "Image/Movie file name (without data refreshing)"
++ * ID|Image.animation_speed -> fps:   int  "Speed of the animation in frames per second"
++ * ID|Image.animation_end -> frame_end:   int  "End frame of an animated texture"
++ * ID|Image.animation_start -> frame_start:   int  "Start frame of an animated texture"
 + * ID|Image.generated_height -> generated_height:   int  "Generated image height"
 + * ID|Image.generated_type -> generated_type:   enum  "Generated image type"
 + * ID|Image.generated_width -> generated_width:   int  "Generated image width"
@@ -1463,8 +1464,8 @@ MAKE COLLECTION ATTR * ID|Curve|TextCurve.active_textbox -> active_textbox:   in
 + * ID|Mesh.total_edge_sel -> total_edge_sel:   int,  "(read-only)    Selected edge count in editmode"
 + * ID|Mesh.total_face_sel -> total_face_sel:   int,  "(read-only)    Selected face count in editmode"
 + * ID|Mesh.total_vert_sel -> total_vert_sel:   int,  "(read-only)    Selected vertex count in editmode"
-+ * ID|Mesh.auto_texspace -> use_auto_texspace:   boolean  "Adjusts active objects texture space automatically when transforming object"
 + * ID|Mesh.autosmooth -> use_auto_smooth:   boolean  "Treats all set-smoothed faces with angles less than the specified angle as smooth during render"
++ * ID|Mesh.auto_texspace -> use_auto_texspace:   boolean  "Adjusts active objects texture space automatically when transforming object"
 + * ID|Mesh.use_mirror_topology -> use_mirror_topology:   boolean  "Use topology based mirroring"
 + * ID|Mesh.use_mirror_x -> use_mirror_x:   boolean  "X Axis mirror editing"
 + * ID|Mesh.use_paint_mask -> use_paint_mask:   boolean  "Face selection masking for painting"
@@ -1724,12 +1725,12 @@ TODO MOVE TO ELEMENTS * ID|MetaBall.active_element -> active_element:   pointer,
 + * ID|Scene.active_keying_set -> active_keying_set:   pointer  "Active Keying Set used to insert/delete keyframes"
 + * ID|Scene.active_keying_set_index -> active_keying_set_index:   int  "Current Keying Set index (negative for builtin and positive for absolute)"
 + * ID|Scene.animation_data -> animation_data:   pointer,  "(read-only)    Animation data for this datablock"
++ * ID|Scene.distance_model -> audio_distance_model:   enum  "Distance model for distance attenuation calculation"
++ * ID|Scene.doppler_factor -> audio_doppler_factor:   float  "Pitch factor for Doppler effect calculation"
 + * ID|Scene.speed_of_sound -> audio_doppler_speed:   float  "Speed of sound for Doppler effect calculation"
 + * ID|Scene.set -> background_set:   pointer  "Background set scene"
 + * ID|Scene.camera -> camera:   pointer  "Active camera used for rendering the scene"
 + * ID|Scene.cursor_location -> cursor_location:   float  "3D cursor location"
-+ * ID|Scene.distance_model -> audio_distance_model:   enum  "Distance model for distance attenuation calculation"
-+ * ID|Scene.doppler_factor -> audio_doppler_factor:   float  "Pitch factor for Doppler effect calculation"
 + * ID|Scene.frame_current -> frame_current:   int  "NO DESCRIPTION"
 + * ID|Scene.frame_end -> frame_end:   int  "Final frame of the playback/rendering range"
 + * ID|Scene.preview_range_frame_end -> frame_preview_end:   int  "Alternative end frame for UI playback"
@@ -1930,11 +1931,11 @@ TODO, move into collectin * ID|WindowManager.active_keyconfig -> active_keyconfi
 + * IKParam|Itasc.auto_step -> use_auto_step:   boolean  "Automatically determine the optimal number of steps for best performance/accuracy trade off"
 + * IKParam|Itasc.max_velocity -> velocity_max:   float  "Maximum joint velocity in rad/s. Default=50"
 + * ImageUser.fields_per_frame -> fields_per_frame:   int  "The number of fields per rendered frame (2 fields is 1 image)"
-+ * ImageUser.frame_start -> frame_start:   int  "Sets the global starting frame of the movie"
 + * ImageUser.frames -> frame_duration:   int  "Sets the number of images of a movie to use"
++ * ImageUser.offset -> frame_offset:   int  "Offsets the number of the frame to use in the animation"
++ * ImageUser.frame_start -> frame_start:   int  "Sets the global starting frame of the movie"
 + * ImageUser.multilayer_layer -> multilayer_layer:   int,  "(read-only)    Layer in multilayer image"
 + * ImageUser.multilayer_pass -> multilayer_pass:   int,  "(read-only)    Pass in multilayer image"
-+ * ImageUser.offset -> frame_offset:   int  "Offsets the number of the frame to use in the animation"
 + * ImageUser.auto_refresh -> use_auto_refresh:   boolean  "Always refresh image on frame changes"
 + * ImageUser.cyclic -> use_cyclic:   boolean  "Cycle the images in the movie"
 + * KeyConfig.user_defined -> is_user_defined:   boolean,  "(read-only)    Indicates that a keyconfig was defined by the user"
@@ -2017,7 +2018,6 @@ TODO MOVE TO COLLECTION * KeyingSet.active_path -> active_path:   pointer  "Acti
 + * LatticePoint.co -> co:   float,  "(read-only)"
 + * LatticePoint.deformed_co -> co_deform:   float  "NO DESCRIPTION"
 + * LatticePoint.groups -> groups:   collection,  "(read-only)    Weights for the vertex groups this point is member of"
-MAKE_curves.active * CurveSplines.active -> active:   pointer  "Active curve spline"
 + * Macro.bl_description -> bl_description:   string  "NO DESCRIPTION"
 + * Macro.bl_idname -> bl_idname:   string  "NO DESCRIPTION"
 + * Macro.bl_label -> bl_label:   string  "NO DESCRIPTION"
@@ -2367,7 +2367,6 @@ MAKE_curves.active * CurveSplines.active -> active:   pointer  "Active curve spl
 + * Modifier|ScrewModifier.use_normal_flip -> use_normal_flip:   boolean  "Flip normals of lathed faces"
 + * Modifier|ScrewModifier.use_object_screw_offset -> use_object_screw_offset:   boolean  "Use the distance between the objects to make a screw"
 + * Modifier|ShrinkwrapModifier.auxiliary_target -> auxiliary_target:   pointer  "Additional mesh target to shrink to"
-+ * Modifier|ShrinkwrapModifier.mode -> wrap_method:   enum  "NO DESCRIPTION"
 + * Modifier|ShrinkwrapModifier.offset -> offset:   float  "Distance to keep from the target"
 + * Modifier|ShrinkwrapModifier.subsurf_levels -> subsurf_levels:   int  "Number of subdivisions that must be performed before extracting vertices positions and normals"
 + * Modifier|ShrinkwrapModifier.target -> target:   pointer  "Mesh target to shrink to"
@@ -2380,11 +2379,12 @@ MAKE_curves.active * CurveSplines.active -> active:   pointer  "Active curve spl
 + * Modifier|ShrinkwrapModifier.y -> use_project_y:   boolean  "NO DESCRIPTION"
 + * Modifier|ShrinkwrapModifier.z -> use_project_z:   boolean  "NO DESCRIPTION"
 + * Modifier|ShrinkwrapModifier.vertex_group -> vertex_group:   string  "Vertex group name"
++ * Modifier|ShrinkwrapModifier.mode -> wrap_method:   enum  "NO DESCRIPTION"
++ * Modifier|SimpleDeformModifier.mode -> deform_method:   enum  "NO DESCRIPTION"
 + * Modifier|SimpleDeformModifier.factor -> factor:   float  "NO DESCRIPTION"
 + * Modifier|SimpleDeformModifier.limits -> limits:   float  "Lower/Upper limits for deform"
 + * Modifier|SimpleDeformModifier.lock_x_axis -> lock_x:   boolean  "NO DESCRIPTION"
 + * Modifier|SimpleDeformModifier.lock_y_axis -> lock_y:   boolean  "NO DESCRIPTION"
-+ * Modifier|SimpleDeformModifier.mode -> deform_method:   enum  "NO DESCRIPTION"
 + * Modifier|SimpleDeformModifier.origin -> origin:   pointer  "Origin of modifier space coordinates"
 + * Modifier|SimpleDeformModifier.relative -> use_relative:   boolean  "Sets the origin of deform space to be relative to the object"
 + * Modifier|SimpleDeformModifier.vertex_group -> vertex_group:   string  "Vertex group name"
@@ -2457,8 +2457,8 @@ MAKE_curves.active * CurveSplines.active -> active:   pointer  "Active curve spl
 + * MotionPathVert.co -> co:   float  "NO DESCRIPTION"
 + * MotionPathVert.select -> select:   boolean  "Path point is selected for editing"
 + * NlaStrip.action -> action:   pointer  "Action referenced by this strip"
-+ * NlaStrip.frame_end -> action_frame_end:   float  "NO DESCRIPTION"
-+ * NlaStrip.frame_start -> action_frame_start:   float  "NO DESCRIPTION"
+NlaStrip.action_frame_end -> action_frame_end:   float  "NO DESCRIPTION"
+NlaStrip.action_frame_start -> action_frame_start:   float  "NO DESCRIPTION"
 + * NlaStrip.active -> active:   boolean,  "(read-only)    NLA Strip is active"
 + * NlaStrip.blend_in -> blend_in:   float  "Number of frames at start of strip to fade in influence"
 + * NlaStrip.blend_out -> blend_out:   float  "NO DESCRIPTION"
@@ -2514,11 +2514,11 @@ MAKE_curves.active * CurveSplines.active -> active:   pointer  "Active curve spl
 + * Node|CompositorNode|CompositorNodeChannelMatte.algorithm -> limit_method:   enum  "Algorithm to use to limit channel"
 + * Node|CompositorNode|CompositorNodeChannelMatte.low -> limit_min:   float  "Values lower than this setting are 100% keyed"
 + * Node|CompositorNode|CompositorNodeChannelMatte.channel -> matte_channel:   enum  "Channel used to determine matte"
-+ * Node|CompositorNode|CompositorNodeChromaMatte.acceptance -> tolerance:   float  "Tolerance for a color to be considered a keying color"
-+ * Node|CompositorNode|CompositorNodeChromaMatte.cutoff -> threshold:   float  "Tolerance below which colors will be considered as exact matches"
 + * Node|CompositorNode|CompositorNodeChromaMatte.gain -> gain:   float  "Alpha gain"
 + * Node|CompositorNode|CompositorNodeChromaMatte.lift -> lift:   float  "Alpha lift"
 + * Node|CompositorNode|CompositorNodeChromaMatte.shadow_adjust -> shadow_adjust:   float  "Adjusts the brightness of any shadows captured"
++ * Node|CompositorNode|CompositorNodeChromaMatte.cutoff -> threshold:   float  "Tolerance below which colors will be considered as exact matches"
++ * Node|CompositorNode|CompositorNodeChromaMatte.acceptance -> tolerance:   float  "Tolerance for a color to be considered a keying color"
 + * Node|CompositorNode|CompositorNodeColorBalance.correction_formula -> correction_method:   enum  "NO DESCRIPTION"
 + * Node|CompositorNode|CompositorNodeColorBalance.gain -> gain:   float  "Correction for Highlights"
 + * Node|CompositorNode|CompositorNodeColorBalance.gamma -> gamma:   float  "Correction for Midtones"
@@ -2529,9 +2529,9 @@ MAKE_curves.active * CurveSplines.active -> active:   pointer  "Active curve spl
 + * Node|CompositorNode|CompositorNodeColorMatte.h -> color_hue:   float  "Hue tolerance for colors to be considered a keying color"
 + * Node|CompositorNode|CompositorNodeColorMatte.s -> color_saturation:   float  "Saturation Tolerance for the color"
 + * Node|CompositorNode|CompositorNodeColorMatte.v -> color_value:   float  "Value Tolerance for the color"
-+ * Node|CompositorNode|CompositorNodeColorSpill.algorithm -> limit_method:   enum  "NO DESCRIPTION"
 + * Node|CompositorNode|CompositorNodeColorSpill.channel -> channel:   enum  "NO DESCRIPTION"
 + * Node|CompositorNode|CompositorNodeColorSpill.limit_channel -> limit_channel:   enum  "NO DESCRIPTION"
++ * Node|CompositorNode|CompositorNodeColorSpill.algorithm -> limit_method:   enum  "NO DESCRIPTION"
 + * Node|CompositorNode|CompositorNodeColorSpill.ratio -> ratio:   float  "Scale limit by value"
 + * Node|CompositorNode|CompositorNodeColorSpill.unspill_blue -> unspill_blue:   float  "Blue spillmap scale"
 + * Node|CompositorNode|CompositorNodeColorSpill.unspill_green -> unspill_green:   float  "Green spillmap scale"
@@ -2586,10 +2586,10 @@ MAKE_curves.active * CurveSplines.active -> active:   pointer  "Active curve spl
 + * Node|CompositorNode|CompositorNodeHueSat.val -> color_value:   float  "NO DESCRIPTION"
 + * Node|CompositorNode|CompositorNodeIDMask.index -> index:   int  "Pass index number to convert to alpha"
 + * Node|CompositorNode|CompositorNodeImage.frames -> frame_duration:   int  "Number of images used in animation"
-+ * Node|CompositorNode|CompositorNodeImage.image -> image:   pointer  "NO DESCRIPTION"
-+ * Node|CompositorNode|CompositorNodeImage.layer -> layer:   enum  "NO DESCRIPTION"
 + * Node|CompositorNode|CompositorNodeImage.offset -> frame_offset:   int  "Offsets the number of the frame to use in the animation"
 + * Node|CompositorNode|CompositorNodeImage.start -> frame_start:   int  "NO DESCRIPTION"
++ * Node|CompositorNode|CompositorNodeImage.image -> image:   pointer  "NO DESCRIPTION"
++ * Node|CompositorNode|CompositorNodeImage.layer -> layer:   enum  "NO DESCRIPTION"
 + * Node|CompositorNode|CompositorNodeImage.auto_refresh -> use_auto_refresh:   boolean  "NO DESCRIPTION"
 + * Node|CompositorNode|CompositorNodeImage.cyclic -> use_cyclic:   boolean  "NO DESCRIPTION"
 + * Node|CompositorNode|CompositorNodeInvert.alpha -> invert_alpha:   boolean  "NO DESCRIPTION"
@@ -2766,20 +2766,20 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * ParticleBrush.use_puff_volume -> use_puff_volume:   boolean  "Apply puff to unselected end-points, (helps maintain hair volume when puffing root)"
 + * ParticleDupliWeight.count -> count:   int  "The number of times this object is repeated with respect to other objects"
 + * ParticleDupliWeight.name -> name:   string,  "(read-only)    Particle dupliobject name"
-+ * ParticleEdit.add_keys -> default_key_count:   int  "How many keys to make new particles with"
 + * ParticleEdit.brush -> brush:   pointer,  "(read-only)"
++ * ParticleEdit.add_keys -> default_key_count:   int  "How many keys to make new particles with"
 + * ParticleEdit.draw_step -> draw_step:   int  "How many steps to draw the path with"
 + * ParticleEdit.emitter_distance -> emitter_distance:   float  "Distance to keep particles away from the emitter"
 + * ParticleEdit.fade_frames -> fade_frames:   int  "How many frames to fade"
-+ * ParticleEdit.editable -> is_valid:   boolean,  "(read-only)    A valid edit mode exists"
 + * ParticleEdit.hair -> is_hair:   boolean,  "(read-only)    Editing hair"
++ * ParticleEdit.editable -> is_valid:   boolean,  "(read-only)    A valid edit mode exists"
 + * ParticleEdit.object -> object:   pointer,  "(read-only)    The edited object"
 + * ParticleEdit.selection_mode -> select_mode:   enum  "Particle select and display mode"
 + * ParticleEdit.draw_particles -> show_particles:   boolean  "Draw actual particles"
 + * ParticleEdit.tool -> tool:   enum  "NO DESCRIPTION"
 + * ParticleEdit.type -> type:   enum  "NO DESCRIPTION"
-+ * ParticleEdit.add_interpolate -> use_default_interpolate:   boolean  "Interpolate new particles from the existing ones"
 + * ParticleEdit.auto_velocity -> use_auto_velocity:   boolean  "Calculate point velocities automatically"
++ * ParticleEdit.add_interpolate -> use_default_interpolate:   boolean  "Interpolate new particles from the existing ones"
 + * ParticleEdit.emitter_deflect -> use_emitter_deflect:   boolean  "Keep paths from intersecting the emitter"
 + * ParticleEdit.fade_time -> use_fade_time:   boolean  "Fade paths and keys further away from current frame"
 + * ParticleEdit.keep_lengths -> use_preserve_length:   boolean  "Keep path lengths constant"
@@ -2839,9 +2839,9 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * ParticleSystem.vertex_group_size -> vertex_group_size:   string  "Vertex group to control size"
 + * ParticleSystem.vertex_group_tangent -> vertex_group_tangent:   string  "Vertex group to control tangent"
 + * ParticleSystem.vertex_group_velocity -> vertex_group_velocity:   string  "Vertex group to control velocity"
++ * ParticleTarget.mode -> alliance:   enum  "NO DESCRIPTION"
 + * ParticleTarget.duration -> duration:   float  "NO DESCRIPTION"
 + * ParticleTarget.valid -> is_valid:   boolean  "Keyed particles target is valid"
-+ * ParticleTarget.mode -> alliance:   enum  "NO DESCRIPTION"
 + * ParticleTarget.name -> name:   string,  "(read-only)    Particle target name"
 + * ParticleTarget.object -> object:   pointer  "The object that has the target particle system (empty if same object)"
 + * ParticleTarget.system -> system:   int  "The index of particle system on the target object"
@@ -2850,6 +2850,7 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * PointCache.filepath -> filepath:   string  "Cache file path"
 + * PointCache.frame_end -> frame_end:   int  "Frame on which the simulation stops"
 + * PointCache.frame_start -> frame_start:   int  "Frame on which the simulation starts"
++ * PointCache.step -> frame_step:   int  "Number of frames between cached frames"
 + * PointCache.frames_skipped -> frames_skipped:   boolean,  "(read-only)"
 + * PointCache.index -> index:   int  "Index number of cache files"
 + * PointCache.info -> info:   string,  "(read-only)    Info on current cache status"
@@ -2858,7 +2859,6 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * PointCache.outdated -> is_outdated:   boolean,  "(read-only)"
 + * PointCache.name -> name:   string  "Cache name"
 + * PointCache.point_cache_list -> point_caches:   collection,  "(read-only)    Point cache list"
-+ * PointCache.step -> frame_step:   int  "Number of frames between cached frames"
 + * PointCache.disk_cache -> use_disk_cache:   boolean  "Save cache files to disk (.blend file must be saved first)"
 + * PointCache.external -> use_external:   boolean  "Read cache from an external location"
 + * PointCache.use_library_path -> use_library_path:   boolean  "Use this files path when library linked into another file."
@@ -3169,7 +3169,6 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * SceneGameData.dome_tesselation -> dome_tesselation:   int  "Tessellation level - check the generated mesh in wireframe mode"
 + * SceneGameData.dome_text -> dome_text:   pointer  "Custom Warp Mesh data file"
 + * SceneGameData.dome_tilt -> dome_tilt:   int  "Camera rotation in horizontal axis"
-+ * SceneGameData.eye_separation -> stereo_eye_separation:   float  "Set the distance between the eyes - the camera focal length/30 should be fine"
 + * SceneGameData.fps -> fps:   int  "The nominal number of game frames per second. Physics fixed timestep = 1/fps, independently of actual frame rate"
 + * SceneGameData.framing_color -> frame_color:   float  "Set colour of the bars"
 + * SceneGameData.framing_type -> frame_type:   enum  "Select the type of Framing you want"
@@ -3188,6 +3187,7 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * SceneGameData.fullscreen -> show_fullscreen:   boolean  "Starts player in a new fullscreen display"
 + * SceneGameData.show_physics_visualization -> show_physics_visualization:   boolean  "Show a visualization of physics bounds and interactions"
 + * SceneGameData.stereo -> stereo:   enum  "NO DESCRIPTION"
++ * SceneGameData.eye_separation -> stereo_eye_separation:   float  "Set the distance between the eyes - the camera focal length/30 should be fine"
 + * SceneGameData.stereo_mode -> stereo_mode:   enum  "Stereographic techniques"
 + * SceneGameData.activity_culling -> use_activity_culling:   boolean  "Activity culling is enabled"
 + * SceneGameData.use_animation_record -> use_animation_record:   boolean  "Record animation to fcurves"
@@ -3313,10 +3313,10 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * Sequence.blend_mode -> blend_type:   enum  "NO DESCRIPTION"
 + * Sequence.channel -> channel:   int  "Y position of the sequence strip"
 + * Sequence.effect_fader -> effect_fader:   float  "NO DESCRIPTION"
-+ * Sequence.frame_final_end -> frame_final_end:   int  "End frame displayed in the sequence editor after offsets are applied"
++ * Sequence.frame_length -> frame_duration:   int,  "(read-only)    The length of the contents of this strip before the handles are applied"
 + * Sequence.frame_final_length -> frame_final_duration:   int  "The length of the contents of this strip before the handles are applied"
++ * Sequence.frame_final_end -> frame_final_end:   int  "End frame displayed in the sequence editor after offsets are applied"
 + * Sequence.frame_final_start -> frame_final_start:   int  "Start frame displayed in the sequence editor after offsets are applied, setting this is equivalent to moving the handle, not the actual start frame"
-+ * Sequence.frame_length -> frame_duration:   int,  "(read-only)    The length of the contents of this strip before the handles are applied"
 + * Sequence.frame_offset_end -> frame_offset_end:   int,  "(read-only)"
 + * Sequence.frame_offset_start -> frame_offset_start:   int,  "(read-only)"
 + * Sequence.frame_start -> frame_start:   int  "NO DESCRIPTION"
@@ -3396,8 +3396,8 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * Sequence|EffectSequence|WipeSequence.blur_width -> blur_width:   float  "Width of the blur edge, in percentage relative to the image size"
 + * Sequence|EffectSequence|WipeSequence.direction -> direction:   enum  "Wipe direction"
 + * Sequence|EffectSequence|WipeSequence.transition_type -> transition_type:   enum  "NO DESCRIPTION"
-+ * Sequence|ImageSequence.animation_end_offset -> frame_offset_end:   int  "Animation end offset (trim end)"
-+ * Sequence|ImageSequence.animation_start_offset -> frame_offset_start:   int  "Animation start offset (trim start)"
++ * Sequence|ImageSequence.animation_end_offset -> animation_offset_end:   int  "Animation end offset (trim end)"
++ * Sequence|ImageSequence.animation_start_offset -> animation_offset_start:   int  "Animation start offset (trim start)"
 + * Sequence|ImageSequence.color_balance -> color_balance:   pointer,  "(read-only)"
 + * Sequence|ImageSequence.multiply_colors -> color_multiply:   float  "NO DESCRIPTION"
 + * Sequence|ImageSequence.color_saturation -> color_saturation:   float  "NO DESCRIPTION"
@@ -3419,8 +3419,8 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * Sequence|ImageSequence.proxy_custom_file -> use_proxy_custom_file:   boolean  "Use a custom file to read proxy data from"
 + * Sequence|ImageSequence.reverse_frames -> use_reverse_frames:   boolean  "Reverse frame order"
 + * Sequence|ImageSequence.use_translation -> use_translation:   boolean  "Translate image before processing"
-+ * Sequence|MetaSequence.animation_end_offset -> frame_offset_end:   int  "Animation end offset (trim end)"
-+ * Sequence|MetaSequence.animation_start_offset -> frame_offset_start:   int  "Animation start offset (trim start)"
++ * Sequence|MetaSequence.animation_end_offset -> animation_offset_end:   int  "Animation end offset (trim end)"
++ * Sequence|MetaSequence.animation_start_offset -> animation_offset_start:   int  "Animation start offset (trim start)"
 + * Sequence|MetaSequence.color_balance -> color_balance:   pointer,  "(read-only)"
 + * Sequence|MetaSequence.multiply_colors -> color_multiply:   float  "NO DESCRIPTION"
 + * Sequence|MetaSequence.color_saturation -> color_saturation:   float  "NO DESCRIPTION"
@@ -3441,8 +3441,8 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * Sequence|MetaSequence.proxy_custom_file -> use_proxy_custom_file:   boolean  "Use a custom file to read proxy data from"
 + * Sequence|MetaSequence.reverse_frames -> use_reverse_frames:   boolean  "Reverse frame order"
 + * Sequence|MetaSequence.use_translation -> use_translation:   boolean  "Translate image before processing"
-+ * Sequence|MovieSequence.animation_end_offset -> frame_offset_end:   int  "Animation end offset (trim end)"
-+ * Sequence|MovieSequence.animation_start_offset -> frame_offset_start:   int  "Animation start offset (trim start)"
++ * Sequence|MovieSequence.animation_end_offset -> animation_offset_end:   int  "Animation end offset (trim end)"
++ * Sequence|MovieSequence.animation_start_offset -> animation_offset_start:   int  "Animation start offset (trim start)"
 + * Sequence|MovieSequence.color_balance -> color_balance:   pointer,  "(read-only)"
 + * Sequence|MovieSequence.multiply_colors -> color_multiply:   float  "NO DESCRIPTION"
 + * Sequence|MovieSequence.color_saturation -> color_saturation:   float  "NO DESCRIPTION"
@@ -3464,8 +3464,8 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * Sequence|MovieSequence.proxy_custom_file -> use_proxy_custom_file:   boolean  "Use a custom file to read proxy data from"
 + * Sequence|MovieSequence.reverse_frames -> use_reverse_frames:   boolean  "Reverse frame order"
 + * Sequence|MovieSequence.use_translation -> use_translation:   boolean  "Translate image before processing"
-+ * Sequence|MulticamSequence.animation_end_offset -> frame_offset_end:   int  "Animation end offset (trim end)"
-+ * Sequence|MulticamSequence.animation_start_offset -> frame_offset_start:   int  "Animation start offset (trim start)"
++ * Sequence|MulticamSequence.animation_end_offset -> animation_offset_end:   int  "Animation end offset (trim end)"
++ * Sequence|MulticamSequence.animation_start_offset -> animation_offset_start:   int  "Animation start offset (trim start)"
 + * Sequence|MulticamSequence.color_balance -> color_balance:   pointer,  "(read-only)"
 + * Sequence|MulticamSequence.multiply_colors -> color_multiply:   float  "NO DESCRIPTION"
 + * Sequence|MulticamSequence.color_saturation -> color_saturation:   float  "NO DESCRIPTION"
@@ -3486,8 +3486,8 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * Sequence|MulticamSequence.proxy_custom_file -> use_proxy_custom_file:   boolean  "Use a custom file to read proxy data from"
 + * Sequence|MulticamSequence.reverse_frames -> use_reverse_frames:   boolean  "Reverse frame order"
 + * Sequence|MulticamSequence.use_translation -> use_translation:   boolean  "Translate image before processing"
-+ * Sequence|SceneSequence.animation_end_offset -> frame_offset_end:   int  "Animation end offset (trim end)"
-+ * Sequence|SceneSequence.animation_start_offset -> frame_offset_start:   int  "Animation start offset (trim start)"
++ * Sequence|SceneSequence.animation_end_offset -> animation_offset_end:   int  "Animation end offset (trim end)"
++ * Sequence|SceneSequence.animation_start_offset -> animation_offset_start:   int  "Animation start offset (trim start)"
 + * Sequence|SceneSequence.color_balance -> color_balance:   pointer,  "(read-only)"
 + * Sequence|SceneSequence.multiply_colors -> color_multiply:   float  "NO DESCRIPTION"
 + * Sequence|SceneSequence.color_saturation -> color_saturation:   float  "NO DESCRIPTION"
@@ -3509,8 +3509,8 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * Sequence|SceneSequence.proxy_custom_file -> use_proxy_custom_file:   boolean  "Use a custom file to read proxy data from"
 + * Sequence|SceneSequence.reverse_frames -> use_reverse_frames:   boolean  "Reverse frame order"
 + * Sequence|SceneSequence.use_translation -> use_translation:   boolean  "Translate image before processing"
-+ * Sequence|SoundSequence.animation_end_offset -> frame_offset_end:   int  "Animation end offset (trim end)"
-+ * Sequence|SoundSequence.animation_start_offset -> frame_offset_start:   int  "Animation start offset (trim start)"
++ * Sequence|SoundSequence.animation_end_offset -> animation_offset_end:   int  "Animation end offset (trim end)"
++ * Sequence|SoundSequence.animation_start_offset -> animation_offset_start:   int  "Animation start offset (trim start)"
 + * Sequence|SoundSequence.attenuation -> attenuation:   float  "Attenuation in dezibel"
 + * Sequence|SoundSequence.filepath -> filepath:   string  "NO DESCRIPTION"
 + * Sequence|SoundSequence.sound -> sound:   pointer,  "(read-only)    Sound datablock used by this sequence"
@@ -3526,27 +3526,27 @@ TODO SHOULD THIS BE HERE * Panel.text -> text:   string  "NO DESCRIPTION"
 + * ShapeKey.value -> value:   float  "Value of shape key at the current frame"
 + * ShapeKey.vertex_group -> vertex_group:   string  "Vertex weight group, to blend with basis shape"
 + * ShapeKeyBezierPoint.co -> co:   float  "NO DESCRIPTION"
-+ * ShapeKeyBezierPoint.handle_1_co -> handle_left:   float  "NO DESCRIPTION"
 + * ShapeKeyBezierPoint.handle_2_co -> handle_hight:   float  "NO DESCRIPTION"
++ * ShapeKeyBezierPoint.handle_1_co -> handle_left:   float  "NO DESCRIPTION"
 + * ShapeKeyCurvePoint.co -> co:   float  "NO DESCRIPTION"
 + * ShapeKeyCurvePoint.tilt -> tilt:   float  "NO DESCRIPTION"
 + * ShapeKeyPoint.co -> co:   float  "NO DESCRIPTION"
 TODO BETTER NAME * SmokeDomainSettings.alpha -> alpha:   float  "Higher value results in sinking smoke"
 + * SmokeDomainSettings.amplify -> amplify:   int  "Enhance the resolution of smoke by this factor using noise"
 TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value results in faster rising smoke"
++ * SmokeDomainSettings.smoke_domain_colli -> collision_extents:   enum  "Selects which domain border will be treated as collision object."
 + * SmokeDomainSettings.coll_group -> collision_group:   pointer  "Limit collisions to this group"
 + * SmokeDomainSettings.dissolve_speed -> dissolve_speed:   int  "Dissolve Speed"
 + * SmokeDomainSettings.eff_group -> eff_group:   pointer  "Limit effectors to this group"
 + * SmokeDomainSettings.effector_weights -> effector_weights:   pointer,  "(read-only)"
 + * SmokeDomainSettings.fluid_group -> fluid_group:   pointer  "Limit fluid objects to this group"
-+ * SmokeDomainSettings.maxres -> resolution_max:   int  "Maximal resolution used in the fluid domain"
 + * SmokeDomainSettings.noise_type -> noise_type:   enum  "Noise method which is used for creating the high resolution"
++ * SmokeDomainSettings.smoke_cache_high_comp -> point_cache_compress_high_type:   enum  "Compression method to be used"
++ * SmokeDomainSettings.smoke_cache_comp -> point_cache_compress_type:   enum  "Compression method to be used"
 + * SmokeDomainSettings.point_cache_high -> point_cache_high:   pointer,  "(read-only)"
 + * SmokeDomainSettings.point_cache_low -> point_cache_low:   pointer,  "(read-only)"
++ * SmokeDomainSettings.maxres -> resolution_max:   int  "Maximal resolution used in the fluid domain"
 + * SmokeDomainSettings.viewhighres -> show_high_resolution:   boolean  "Show high resolution (using amplification)"
-+ * SmokeDomainSettings.smoke_cache_comp -> point_cache_compress_type:   enum  "Compression method to be used"
-+ * SmokeDomainSettings.smoke_cache_high_comp -> point_cache_compress_high_type:   enum  "Compression method to be used"
-+ * SmokeDomainSettings.smoke_domain_colli -> collision_extents:   enum  "Selects which domain border will be treated as collision object."
 + * SmokeDomainSettings.smoothemitter -> smooth_emitter:   boolean  "Smoothens emitted smoke to avoid blockiness."
 + * SmokeDomainSettings.strength -> strength:   float  "Strength of wavelet noise"
 + * SmokeDomainSettings.time_scale -> time_scale:   float  "Adjust simulation speed."
@@ -3554,11 +3554,11 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * SmokeDomainSettings.dissolve_smoke_log -> use_dissolve_smoke_log:   boolean  "Using 1/x"
 + * SmokeDomainSettings.highres -> use_high_resolution:   boolean  "Enable high resolution (using amplification)"
 + * SmokeDomainSettings.vorticity -> vorticity:   float  "Amount of turbulence/rotation in fluid."
-+ * SmokeFlowSettings.absolute -> use_absolute:   boolean  "Only allows given density value in emitter area."
 + * SmokeFlowSettings.density -> density:   float  "NO DESCRIPTION"
 + * SmokeFlowSettings.initial_velocity -> initial_velocity:   boolean  "Smoke inherits its velocity from the emitter particle"
 + * SmokeFlowSettings.psys -> particle_system:   pointer  "Particle systems emitted from the object"
 + * SmokeFlowSettings.temperature -> temperature:   float  "Temperature difference to ambient temperature"
++ * SmokeFlowSettings.absolute -> use_absolute:   boolean  "Only allows given density value in emitter area."
 +NEGATE * SmokeFlowSettings.outflow -> use_outflow:   boolean  "Deletes smoke from simulation"
 + * SmokeFlowSettings.velocity_multiplier -> velocity_factor:   float  "Multiplier to adjust velocity passed to smoke"
 + * SoftBodySettings.aero -> aero:   float  "Make edges sail"
@@ -3582,13 +3582,13 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * SoftBodySettings.goal_vertex_group -> goal_vertex_group:   string  "Control point weight values"
 + * SoftBodySettings.gravity -> gravity:   float  "Apply gravitation to point movement"
 + * SoftBodySettings.lcom -> location_mass_center:   float  "Location of Center of mass"
-+ * SoftBodySettings.lrot -> rotation_estimate:   float  "Estimated rotation matrix"
-+ * SoftBodySettings.lscale -> scale_estimate:   float  "Estimated scale matrix"
 + * SoftBodySettings.mass -> mass:   float  "General Mass value"
 + * SoftBodySettings.mass_vertex_group -> mass_vertex_group:   string  "Control point mass values"
 + * SoftBodySettings.plastic -> plastic:   float  "Permanent deform"
 + * SoftBodySettings.pull -> pull:   float  "Edge spring stiffness when longer than rest length"
 + * SoftBodySettings.push -> push:   float  "Edge spring stiffness when shorter than rest length"
++ * SoftBodySettings.lrot -> rotation_estimate:   float  "Estimated rotation matrix"
++ * SoftBodySettings.lscale -> scale_estimate:   float  "Estimated scale matrix"
 + * SoftBodySettings.shear -> shear:   float  "Shear Stiffness"
 + * SoftBodySettings.speed -> speed:   float  "Tweak timing for physics to control frequency and speed"
 + * SoftBodySettings.spring_length -> spring_length:   float  "Alter spring length to shrink/blow up (unit %) 0 to disable"
@@ -3608,6 +3608,7 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * SpaceUVEditor.cursor_location -> cursor_location:   float  "2D cursor location for this view"
 + * SpaceUVEditor.draw_stretch_type -> draw_stretch_type:   enum  "Type of stretch to draw"
 + * SpaceUVEditor.edge_draw_type -> edge_draw_type:   enum  "Draw type for drawing UV edges"
++ * SpaceUVEditor.constrain_to_image_bounds -> lock_bounds:   boolean  "Constraint to stay within the image bounds while editing"
 + * SpaceUVEditor.pivot -> pivot_point:   enum  "Rotation/Scaling Pivot"
 + * SpaceUVEditor.draw_modified_edges -> show_modified_edges:   boolean  "Draw edges after modifiers are applied"
 + * SpaceUVEditor.normalized_coordinates -> show_normalized_coords:   boolean  "Display UV coordinates from 0.0 to 1.0 rather than in pixels"
@@ -3615,7 +3616,6 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * SpaceUVEditor.draw_smooth_edges -> show_smooth_edges:   boolean  "Draw UV edges anti-aliased"
 + * SpaceUVEditor.draw_stretch -> show_stretch:   boolean  "Draw faces colored according to the difference in shape between UVs and their 3D coordinates (blue for low distortion, red for high distortion)"
 + * SpaceUVEditor.sticky_selection_mode -> sticky_select_mode:   enum  "Automatically select also UVs sharing the same vertex as the ones being selected"
-+ * SpaceUVEditor.constrain_to_image_bounds -> lock_bounds:   boolean  "Constraint to stay within the image bounds while editing"
 + * SpaceUVEditor.live_unwrap -> use_live_unwrap:   boolean  "Continuously unwrap the selected UV island while transforming pinned vertices"
 + * SpaceUVEditor.snap_to_pixels -> use_snap_to_pixels:   boolean  "Snap UVs to pixel locations while editing"
 + * Space|SpaceConsole.console_type -> console_type:   enum  "Console type"
@@ -3696,8 +3696,8 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * Space|SpaceNodeEditor.backdrop -> show_backdrop:   boolean  "Use active Viewer Node output as backdrop for compositing nodes"
 + * Space|SpaceNodeEditor.texture_type -> texture_type:   enum  "Type of data to take texture from"
 + * Space|SpaceNodeEditor.tree_type -> tree_type:   enum  "Node tree type to display and edit"
-+ * Space|SpaceOutliner.display_filter -> filter_text:   string  "Live search filtering string"
 + * Space|SpaceOutliner.display_mode -> display_mode:   enum  "Type of information to display"
++ * Space|SpaceOutliner.display_filter -> filter_text:   string  "Live search filtering string"
 + * Space|SpaceOutliner.show_restriction_columns -> show_restrict_columns:   boolean  "Show column"
 + * Space|SpaceOutliner.match_case_sensitive -> use_filter_case_sensitive:   boolean  "Only use case sensitive matches of search string"
 + * Space|SpaceOutliner.match_complete -> use_filter_complete:   boolean  "Only use complete matches of search string"
@@ -3724,6 +3724,7 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * Space|SpaceTextEditor.find_text -> find_text:   string  "Text to search for with the find tool"
 + * Space|SpaceTextEditor.font_size -> font_size:   int  "Font size to use for displaying the text"
 + * Space|SpaceTextEditor.replace_text -> replace_text:   string  "Text to replace selected text with using the replace tool"
+Space|SpaceTextEditor.show_line_highlight -> show_line_highlight:   boolean  "Highlight the current line"
 + * Space|SpaceTextEditor.show_line_numbers -> show_line_numbers:   boolean  "Show line numbers next to the text"
 + * Space|SpaceTextEditor.show_syntax_highlight -> show_syntax_highlight:   boolean  "Syntax highlight for scripting"
 + * Space|SpaceTextEditor.show_word_wrap -> show_word_wrap:   boolean  "Wrap words if there is not enough horizontal space"
@@ -3837,12 +3838,12 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * TextCharacterFormat.use_small_caps -> use_small_caps:   boolean  "NO DESCRIPTION"
 + * TextCharacterFormat.underline -> use_underline:   boolean  "NO DESCRIPTION"
 + * TextLine.body -> body:   string  "Text in the line"
-+ * TextMarker.color -> color:   float  "Color to display the marker with"
 + * TextMarker.end -> character_index_end:   int,  "(read-only)    Start position of the marker in the line"
++ * TextMarker.start -> character_index_start:   int,  "(read-only)    Start position of the marker in the line"
++ * TextMarker.color -> color:   float  "Color to display the marker with"
 + * TextMarker.group -> group:   int,  "(read-only)"
 + * TextMarker.temporary -> is_temporary:   boolean,  "(read-only)    Marker is temporary"
 + * TextMarker.line -> line:   int,  "(read-only)    Line in which the marker is located"
-+ * TextMarker.start -> character_index_start:   int,  "(read-only)    Start position of the marker in the line"
 + * TextMarker.edit_all -> use_edit_all:   boolean,  "(read-only)    Edit all markers of the same group as one"
 + * TextureSlot.blend_type -> blend_type:   enum  "NO DESCRIPTION"
 + * TextureSlot.color -> color:   float  "The default color for textures that dont return RGB"
@@ -3865,28 +3866,31 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * TextureSlot|LampTextureSlot.map_shadow -> use_map_shadow:   boolean  "Lets the texture affect the shadow color of the lamp"
 + * TextureSlot|MaterialTextureSlot.alpha_factor -> alpha_factor:   float  "Amount texture affects alpha"
 + * TextureSlot|MaterialTextureSlot.ambient_factor -> ambient_factor:   float  "Amount texture affects ambient"
-+ * TextureSlot|MaterialTextureSlot.colordiff_factor -> diffuse_color_factor:   float  "Amount texture affects diffuse color"
 + * TextureSlot|MaterialTextureSlot.coloremission_factor -> color_emission_factor:   float  "Amount texture affects emission color"
-+ * TextureSlot|MaterialTextureSlot.colorreflection_factor -> reflection_color_factor:   float  "Amount texture affects color of out-scattered light"
-+ * TextureSlot|MaterialTextureSlot.colorspec_factor -> specular_color_factor:   float  "Amount texture affects specular color"
-+ * TextureSlot|MaterialTextureSlot.colortransmission_factor -> transmission_color_factor:   float  "Amount texture affects result color after light has been scattered/absorbed"
 + * TextureSlot|MaterialTextureSlot.density_factor -> density_factor:   float  "Amount texture affects density"
++ * TextureSlot|MaterialTextureSlot.colordiff_factor -> diffuse_color_factor:   float  "Amount texture affects diffuse color"
 + * TextureSlot|MaterialTextureSlot.diffuse_factor -> diffuse_factor:   float  "Amount texture affects diffuse reflectivity"
 + * TextureSlot|MaterialTextureSlot.displacement_factor -> displacement_factor:   float  "Amount texture displaces the surface"
 + * TextureSlot|MaterialTextureSlot.emission_factor -> emission_factor:   float  "Amount texture affects emission"
 + * TextureSlot|MaterialTextureSlot.emit_factor -> emit_factor:   float  "Amount texture affects emission"
 + * TextureSlot|MaterialTextureSlot.hardness_factor -> hard_factor:   float  "Amount texture affects hardness"
 + * TextureSlot|MaterialTextureSlot.mapping -> mapping:   enum  "NO DESCRIPTION"
++ * TextureSlot|MaterialTextureSlot.x_mapping -> mapping_x:   enum  "NO DESCRIPTION"
++ * TextureSlot|MaterialTextureSlot.y_mapping -> mapping_y:   enum  "NO DESCRIPTION"
++ * TextureSlot|MaterialTextureSlot.z_mapping -> mapping_z:   enum  "NO DESCRIPTION"
 + * TextureSlot|MaterialTextureSlot.mirror_factor -> mirror_factor:   float  "Amount texture affects mirror color"
 + * TextureSlot|MaterialTextureSlot.normal_factor -> normal_factor:   float  "Amount texture affects normal values"
 + * TextureSlot|MaterialTextureSlot.normal_map_space -> normal_map_space:   enum  "NO DESCRIPTION"
 + * TextureSlot|MaterialTextureSlot.object -> object:   pointer  "Object to use for mapping with Object texture coordinates"
 + * TextureSlot|MaterialTextureSlot.raymir_factor -> raymir_factor:   float  "Amount texture affects ray mirror"
++ * TextureSlot|MaterialTextureSlot.colorreflection_factor -> reflection_color_factor:   float  "Amount texture affects color of out-scattered light"
 + * TextureSlot|MaterialTextureSlot.reflection_factor -> reflection_factor:   float  "Amount texture affects brightness of out-scattered light"
 + * TextureSlot|MaterialTextureSlot.scattering_factor -> scattering_factor:   float  "Amount texture affects scattering"
++ * TextureSlot|MaterialTextureSlot.colorspec_factor -> specular_color_factor:   float  "Amount texture affects specular color"
 + * TextureSlot|MaterialTextureSlot.specular_factor -> specular_factor:   float  "Amount texture affects specular reflectivity"
 + * TextureSlot|MaterialTextureSlot.texture_coordinates -> texture_coords:   enum  "NO DESCRIPTION"
 + * TextureSlot|MaterialTextureSlot.translucency_factor -> translucency_factor:   float  "Amount texture affects translucency"
++ * TextureSlot|MaterialTextureSlot.colortransmission_factor -> transmission_color_factor:   float  "Amount texture affects result color after light has been scattered/absorbed"
 + * TextureSlot|MaterialTextureSlot.enabled -> use:   boolean  "Enable this material texture slot"
 + * TextureSlot|MaterialTextureSlot.from_dupli -> use_from_dupli:   boolean  "Duplis instanced from verts, faces or particles, inherit texture coordinate from their parent"
 + * TextureSlot|MaterialTextureSlot.from_original -> use_from_original:   boolean  "Duplis derive their object coordinates from the original objects transformation"
@@ -3914,9 +3918,6 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 +NEGATE * TextureSlot|MaterialTextureSlot.new_bump -> use_old_bump:   boolean  "Use new, corrected bump mapping code (backwards compatibility option)"
 + * TextureSlot|MaterialTextureSlot.uv_layer -> uv_layer:   string  "UV layer to use for mapping with UV texture coordinates"
 + * TextureSlot|MaterialTextureSlot.warp_factor -> warp_factor:   float  "Amount texture affects texture coordinates of next channels"
-+ * TextureSlot|MaterialTextureSlot.x_mapping -> mapping_x:   enum  "NO DESCRIPTION"
-+ * TextureSlot|MaterialTextureSlot.y_mapping -> mapping_y:   enum  "NO DESCRIPTION"
-+ * TextureSlot|MaterialTextureSlot.z_mapping -> mapping_z:   enum  "NO DESCRIPTION"
 + * TextureSlot|WorldTextureSlot.blend_factor -> blend_factor:   float  "Amount texture affects color progression of the background"
 + * TextureSlot|WorldTextureSlot.horizon_factor -> horizon_factor:   float  "Amount texture affects color of the horizon"
 + * TextureSlot|WorldTextureSlot.object -> object:   pointer  "Object to use for mapping with Object texture coordinates"
@@ -4161,8 +4162,8 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * ThemeNodeEditor.text -> text:   float  "NO DESCRIPTION"
 + * ThemeNodeEditor.text_hi -> text_hi:   float  "NO DESCRIPTION"
 + * ThemeNodeEditor.title -> title:   float  "NO DESCRIPTION"
-+ * ThemeNodeEditor.wire_select -> wire_select:   float  "NO DESCRIPTION"
 + * ThemeNodeEditor.wires -> wire:   float  "NO DESCRIPTION"
++ * ThemeNodeEditor.wire_select -> wire_select:   float  "NO DESCRIPTION"
 + * ThemeOutliner.back -> back:   float  "NO DESCRIPTION"
 + * ThemeOutliner.button -> button:   float  "NO DESCRIPTION"
 + * ThemeOutliner.button_text -> button_text:   float  "NO DESCRIPTION"
@@ -4365,7 +4366,6 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * ToolSettings.particle_edit -> particle_edit:   pointer,  "(read-only)"
 + * ToolSettings.proportional_editing -> proportional_edit:   enum  "Proportional editing mode"
 + * ToolSettings.proportional_editing_falloff -> proportional_edit_falloff:   enum  "Falloff type for proportional editing mode"
-+ * ToolSettings.proportional_editing_objects -> use_proportional_edit_objects:   boolean  "Proportional editing object mode"
 + * ToolSettings.sculpt -> sculpt:   pointer,  "(read-only)"
 + * ToolSettings.sculpt_paint_use_unified_size -> sculpt_paint_use_unified_size:   boolean  "Instead of per brush radius, the radius is shared across brushes"
 + * ToolSettings.sculpt_paint_use_unified_strength -> sculpt_paint_use_unified_strength:   boolean  "Instead of per brush strength, the strength is shared across brushes"
@@ -4373,12 +4373,13 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * ToolSettings.snap_element -> snap_element:   enum  "Type of element to snap to"
 + * ToolSettings.snap_target -> snap_target:   enum  "Which part to snap onto the target"
 + * ToolSettings.auto_normalize -> use_auto_normalize:   boolean  "Ensure all bone-deforming vertex groups add up to 1.0 while weight painting"
-+ * ToolSettings.automerge_editing -> use_mesh_automerge:   boolean  "Automatically merge vertices moved to the same location"
 + * ToolSettings.bone_sketching -> use_bone_sketching:   boolean  "DOC BROKEN"
 + * ToolSettings.etch_autoname -> use_etch_autoname:   boolean  "DOC BROKEN"
 + * ToolSettings.etch_overdraw -> use_etch_overdraw:   boolean  "DOC BROKEN"
 + * ToolSettings.etch_quick -> use_etch_quick:   boolean  "DOC BROKEN"
 + * ToolSettings.use_auto_keying -> use_keyframe_insert_auto:   boolean  "Automatic keyframe insertion for Objects and Bones"
++ * ToolSettings.automerge_editing -> use_mesh_automerge:   boolean  "Automatically merge vertices moved to the same location"
++ * ToolSettings.proportional_editing_objects -> use_proportional_edit_objects:   boolean  "Proportional editing object mode"
 + * ToolSettings.record_with_nla -> use_record_with_nla:   boolean  "Add a new NLA Track + Strip for every loop/pass made over the animation to allow non-destructive tweaking"
 + * ToolSettings.snap -> use_snap:   boolean  "Snap during transform"
 + * ToolSettings.snap_align_rotation -> use_snap_align_rotation:   boolean  "Align rotation with the snapping target"
@@ -4451,46 +4452,46 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * UserPreferencesFilePaths.auto_save_time -> auto_save_time:   int  "The time (in minutes) to wait between automatic temporary saves"
 + * UserPreferencesFilePaths.fonts_directory -> font_directory:   string  "The default directory to search for loading fonts"
 + * UserPreferencesFilePaths.image_editor -> image_editor:   string  "Path to an image editor"
-+ * UserPreferencesFilePaths.python_scripts_directory -> script_directory:   string  "The default directory to search for Python scripts (resets python module search path: sys.path)"
 + * UserPreferencesFilePaths.recent_files -> recent_files:   int  "Maximum number of recently opened files to remember"
 + * UserPreferencesFilePaths.render_output_directory -> render_output_directory:   string  "The default directory for rendering output"
 + * UserPreferencesFilePaths.save_version -> save_version:   int  "The number of old versions to maintain in the current directory, when manually saving"
++ * UserPreferencesFilePaths.python_scripts_directory -> script_directory:   string  "The default directory to search for Python scripts (resets python module search path: sys.path)"
 + * UserPreferencesFilePaths.sequence_plugin_directory -> sequence_plugin_directory:   string  "The default directory to search for sequence plugins"
 + * UserPreferencesFilePaths.hide_dot_files_datablocks -> show_hidden_files_datablocks:   boolean  "Hide files/datablocks that start with a dot(.*)"
 + * UserPreferencesFilePaths.sounds_directory -> sound_directory:   string  "The default directory to search for sounds"
 + * UserPreferencesFilePaths.temporary_directory -> temporary_directory:   string  "The directory for storing temporary save files"
-+ * UserPreferencesFilePaths.texture_plugin_directory -> texture_plugin_directory:   string  "The default directory to search for texture plugins"
 + * UserPreferencesFilePaths.textures_directory -> texture_directory:   string  "The default directory to search for textures"
++ * UserPreferencesFilePaths.texture_plugin_directory -> texture_plugin_directory:   string  "The default directory to search for texture plugins"
 + * UserPreferencesFilePaths.auto_save_temporary_files -> use_auto_save_temporary_files:   boolean  "Automatic saving of temporary files"
 + * UserPreferencesFilePaths.compress_file -> use_file_compression:   boolean  "Enable file compression when saving .blend files"
 + * UserPreferencesFilePaths.filter_file_extensions -> use_filter_files:   boolean  "Display only files with extensions in the image select window"
 + * UserPreferencesFilePaths.load_ui -> use_load_ui:   boolean  "Load user interface setup when loading .blend files"
 + * UserPreferencesFilePaths.use_relative_paths -> use_relative_paths:   boolean  "Default relative path option for the file selector"
 + * UserPreferencesFilePaths.save_preview_images -> use_save_preview_images:   boolean  "Enables automatic saving of preview images in the .blend file"
-+ * UserPreferencesInput.double_click_time -> mouse_double_click_time:   int  "The time (in ms) for a double click"
 + * UserPreferencesInput.edited_keymaps -> edited_keymaps:   collection,  "(read-only)"
 + * UserPreferencesInput.invert_zoom_direction -> invert_mouse_wheel_zoom:   boolean  "Invert the axis of mouse movement for zooming"
++ * UserPreferencesInput.wheel_invert_zoom -> invert_zoom_wheel:   boolean  "Swap the Mouse Wheel zoom direction"
++ * UserPreferencesInput.double_click_time -> mouse_double_click_time:   int  "The time (in ms) for a double click"
 + * UserPreferencesInput.ndof_pan_speed -> ndof_pan_speed:   int  "The overall panning speed of an NDOF device, as percent of standard"
 + * UserPreferencesInput.ndof_rotate_speed -> ndof_rotate_speed:   int  "The overall rotation speed of an NDOF device, as percent of standard"
 + * UserPreferencesInput.select_mouse -> select_mouse:   enum  "The mouse button used for selection"
++ * UserPreferencesInput.emulate_numpad -> use_emulate_numpad:   boolean  "Causes the 1 to 0 keys to act as the numpad (useful for laptops)"
 + * UserPreferencesInput.continuous_mouse -> use_mouse_continuous:   boolean  "Allow moving the mouse outside the view on some manipulations (transform, ui control drag)"
 + * UserPreferencesInput.emulate_3_button_mouse -> use_mouse_emulate_3_button:   boolean  "Emulates Middle Mouse with Alt+LeftMouse (doesnt work with Left Mouse Select option)"
-+ * UserPreferencesInput.emulate_numpad -> use_emulate_numpad:   boolean  "Causes the 1 to 0 keys to act as the numpad (useful for laptops)"
 + * UserPreferencesInput.use_middle_mouse_paste -> use_mouse_mmb_paste:   boolean  "In text window, paste with middle mouse button instead of panning"
 + * UserPreferencesInput.view_rotation -> view_rotate_method:   enum  "Rotation style in the viewport"
-+ * UserPreferencesInput.wheel_invert_zoom -> invert_zoom_wheel:   boolean  "Swap the Mouse Wheel zoom direction"
-+ * UserPreferencesInput.wheel_scroll_lines -> wheel_scroll_lines:   int  "The number of lines scrolled at a time with the mouse wheel"
 + * UserPreferencesInput.zoom_axis -> view_zoom_axis:   enum  "Axis of mouse movement to zoom in or out on"
 + * UserPreferencesInput.zoom_style -> view_zoom_method:   enum  "Which style to use for viewport scaling"
++ * UserPreferencesInput.wheel_scroll_lines -> wheel_scroll_lines:   int  "The number of lines scrolled at a time with the mouse wheel"
 + * UserPreferencesSystem.audio_channels -> audio_channels:   enum  "Sets the audio channel count"
 + * UserPreferencesSystem.audio_device -> audio_device:   enum  "Sets the audio output device"
 + * UserPreferencesSystem.audio_mixing_buffer -> audio_mixing_buffer:   enum  "Sets the number of samples used by the audio mixing buffer"
 + * UserPreferencesSystem.audio_sample_format -> audio_sample_format:   enum  "Sets the audio sample format"
 + * UserPreferencesSystem.audio_sample_rate -> audio_sample_rate:   enum  "Sets the audio sample rate"
-+ * UserPreferencesSystem.clip_alpha -> gl_clip_alpha:   float  "Clip alpha below this threshold in the 3D textured view"
 + * UserPreferencesSystem.color_picker_type -> color_picker_type:   enum  "Different styles of displaying the color picker widget"
 + * UserPreferencesSystem.dpi -> dpi:   int  "Font size and resolution for display"
 + * UserPreferencesSystem.frame_server_port -> frame_server_port:   int  "Frameserver Port for Frameserver Rendering"
++ * UserPreferencesSystem.clip_alpha -> gl_clip_alpha:   float  "Clip alpha below this threshold in the 3D textured view"
 + * UserPreferencesSystem.gl_texture_limit -> gl_texture_limit:   enum  "Limit the texture size to save graphics memory"
 + * UserPreferencesSystem.language -> language:   enum  "Language use for translation"
 + * UserPreferencesSystem.memory_cache_limit -> memory_cache_limit:   int  "Memory cache limit in sequencer (megabytes)"
@@ -4561,11 +4562,11 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * VoxelData.domain_object -> domain_object:   pointer  "Object used as the smoke simulation domain"
 + * VoxelData.extension -> extension:   enum  "Sets how the texture is extrapolated past its original bounds"
 + * VoxelData.file_format -> file_format:   enum  "Format of the source data set to render"
++ * VoxelData.source_path -> filepath:   string  "The external source data file to use"
 + * VoxelData.intensity -> intensity:   float  "Multiplier for intensity values"
 + * VoxelData.interpolation -> interpolation:   enum  "Method to interpolate/smooth values between voxel cells"
 + * VoxelData.resolution -> resolution:   int  "Resolution of the voxel grid"
 + * VoxelData.smoke_data_type -> smoke_data_type:   enum  "Simulation value to be used as a texture"
-+ * VoxelData.source_path -> filepath:   string  "The external source data file to use"
 + * VoxelData.still_frame_number -> still_frame:   int  "The frame number to always use"
 + * VoxelData.still -> use_still_frame:   boolean  "Always render a still frame from the voxel data sequence"
 + * Window.screen -> screen:   pointer  "Active screen showing in the window"
@@ -4601,4 +4602,4 @@ TODO BETTER NAME * SmokeDomainSettings.beta -> beta:   float  "Higher value resu
 + * WorldStarsSettings.color_randomization -> color_random:   float  "Randomize star colors"
 + * WorldStarsSettings.min_distance -> distance_min:   float  "Minimum distance to the camera for stars"
 + * WorldStarsSettings.size -> size:   float  "Average screen dimension of stars"
-+ * WorldStarsSettings.use_stars -> use_stars:   boolean  "Enable starfield generation"
\ No newline at end of file
++ * WorldStarsSettings.use_stars -> use_stars:   boolean  "Enable starfield generation"