Merging r40493 through r40509 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 23 Sep 2011 19:39:45 +0000 (19:39 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 23 Sep 2011 19:39:45 +0000 (19:39 +0000)
16 files changed:
release/scripts/modules/addon_utils.py
release/scripts/modules/animsys_refactor.py
release/scripts/startup/bl_operators/__init__.py
release/scripts/startup/bl_operators/anim.py
release/scripts/startup/bl_operators/animsys_update.py [deleted file]
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/__init__.py
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_add.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/modifiers/intern/MOD_navmesh.c
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

index 0c5ef69e8057deb3809a10b7ac5903c4271e547a..ef9a4615ff2e92f577dbdf4934c8f9225ba65f1c 100644 (file)
@@ -33,6 +33,7 @@ import bpy as _bpy
 
 error_duplicates = False
 error_encoding = False
+addons_fake_modules = {}
 
 
 def paths():
index 5336a8b2b3550dcf744e860eb22a9849a64b010b..88097ed3d284db2bb113331ba785bb08086b22bc 100644 (file)
@@ -215,6 +215,674 @@ def update_data_paths(rna_update):
                         print("fcurve (%s): %s -> %s" % (id_data.name, data_path, data_path_new))
 
 
+# we could have this data in its own file but no point really
+data_2_56_to_2_59 = (
+    ("ClothCollisionSettings", "min_distance", "distance_min"),
+    ("ClothCollisionSettings", "self_min_distance", "self_distance_min"),
+    ("ClothCollisionSettings", "enable_collision", "use_collision"),
+    ("ClothCollisionSettings", "enable_self_collision", "use_self_collision"),
+    ("ClothSettings", "pin_cloth", "use_pin_cloth"),
+    ("ClothSettings", "stiffness_scaling", "use_stiffness_scale"),
+    ("CollisionSettings", "random_damping", "damping_random"),
+    ("CollisionSettings", "random_friction", "friction_random"),
+    ("CollisionSettings", "inner_thickness", "thickness_inner"),
+    ("CollisionSettings", "outer_thickness", "thickness_outer"),
+    ("CollisionSettings", "kill_particles", "use_particle_kill"),
+    ("Constraint", "proxy_local", "is_proxy_local"),
+    ("ActionConstraint", "maximum", "max"),
+    ("ActionConstraint", "minimum", "min"),
+    ("FollowPathConstraint", "use_fixed_position", "use_fixed_location"),
+    ("KinematicConstraint", "chain_length", "chain_count"),
+    ("KinematicConstraint", "pos_lock_x", "lock_location_x"),
+    ("KinematicConstraint", "pos_lock_y", "lock_location_y"),
+    ("KinematicConstraint", "pos_lock_z", "lock_location_z"),
+    ("KinematicConstraint", "rot_lock_x", "lock_rotation_x"),
+    ("KinematicConstraint", "rot_lock_y", "lock_rotation_y"),
+    ("KinematicConstraint", "rot_lock_z", "lock_rotation_z"),
+    ("KinematicConstraint", "axis_reference", "reference_axis"),
+    ("KinematicConstraint", "use_position", "use_location"),
+    ("LimitLocationConstraint", "maximum_x", "max_x"),
+    ("LimitLocationConstraint", "maximum_y", "max_y"),
+    ("LimitLocationConstraint", "maximum_z", "max_z"),
+    ("LimitLocationConstraint", "minimum_x", "min_x"),
+    ("LimitLocationConstraint", "minimum_y", "min_y"),
+    ("LimitLocationConstraint", "minimum_z", "min_z"),
+    ("LimitLocationConstraint", "use_maximum_x", "use_max_x"),
+    ("LimitLocationConstraint", "use_maximum_y", "use_max_y"),
+    ("LimitLocationConstraint", "use_maximum_z", "use_max_z"),
+    ("LimitLocationConstraint", "use_minimum_x", "use_min_x"),
+    ("LimitLocationConstraint", "use_minimum_y", "use_min_y"),
+    ("LimitLocationConstraint", "use_minimum_z", "use_min_z"),
+    ("LimitLocationConstraint", "limit_transform", "use_transform_limit"),
+    ("LimitRotationConstraint", "maximum_x", "max_x"),
+    ("LimitRotationConstraint", "maximum_y", "max_y"),
+    ("LimitRotationConstraint", "maximum_z", "max_z"),
+    ("LimitRotationConstraint", "minimum_x", "min_x"),
+    ("LimitRotationConstraint", "minimum_y", "min_y"),
+    ("LimitRotationConstraint", "minimum_z", "min_z"),
+    ("LimitRotationConstraint", "limit_transform", "use_transform_limit"),
+    ("LimitScaleConstraint", "maximum_x", "max_x"),
+    ("LimitScaleConstraint", "maximum_y", "max_y"),
+    ("LimitScaleConstraint", "maximum_z", "max_z"),
+    ("LimitScaleConstraint", "minimum_x", "min_x"),
+    ("LimitScaleConstraint", "minimum_y", "min_y"),
+    ("LimitScaleConstraint", "minimum_z", "min_z"),
+    ("LimitScaleConstraint", "use_maximum_x", "use_max_x"),
+    ("LimitScaleConstraint", "use_maximum_y", "use_max_y"),
+    ("LimitScaleConstraint", "use_maximum_z", "use_max_z"),
+    ("LimitScaleConstraint", "use_minimum_x", "use_min_x"),
+    ("LimitScaleConstraint", "use_minimum_y", "use_min_y"),
+    ("LimitScaleConstraint", "use_minimum_z", "use_min_z"),
+    ("LimitScaleConstraint", "limit_transform", "use_transform_limit"),
+    ("PivotConstraint", "enabled_rotation_range", "rotation_range"),
+    ("PivotConstraint", "use_relative_position", "use_relative_location"),
+    ("PythonConstraint", "number_of_targets", "target_count"),
+    ("SplineIKConstraint", "chain_length", "chain_count"),
+    ("SplineIKConstraint", "chain_offset", "use_chain_offset"),
+    ("SplineIKConstraint", "even_divisions", "use_even_divisions"),
+    ("SplineIKConstraint", "y_stretch", "use_y_stretch"),
+    ("SplineIKConstraint", "xz_scaling_mode", "xz_scale_mode"),
+    ("StretchToConstraint", "original_length", "rest_length"),
+    ("TrackToConstraint", "target_z", "use_target_z"),
+    ("TransformConstraint", "extrapolate_motion", "use_motion_extrapolate"),
+    ("FieldSettings", "do_location", "apply_to_location"),
+    ("FieldSettings", "do_rotation", "apply_to_rotation"),
+    ("FieldSettings", "maximum_distance", "distance_max"),
+    ("FieldSettings", "minimum_distance", "distance_min"),
+    ("FieldSettings", "radial_maximum", "radial_max"),
+    ("FieldSettings", "radial_minimum", "radial_min"),
+    ("FieldSettings", "force_2d", "use_2d_force"),
+    ("FieldSettings", "do_absorption", "use_absorption"),
+    ("FieldSettings", "global_coordinates", "use_global_coords"),
+    ("FieldSettings", "guide_path_add", "use_guide_path_add"),
+    ("FieldSettings", "multiple_springs", "use_multiple_springs"),
+    ("FieldSettings", "use_coordinates", "use_object_coords"),
+    ("FieldSettings", "root_coordinates", "use_root_coords"),
+    ("ControlFluidSettings", "reverse_frames", "use_reverse_frames"),
+    ("DomainFluidSettings", "real_world_size", "simulation_scale"),
+    ("DomainFluidSettings", "surface_smoothing", "surface_smooth"),
+    ("DomainFluidSettings", "reverse_frames", "use_reverse_frames"),
+    ("DomainFluidSettings", "generate_speed_vectors", "use_speed_vectors"),
+    ("DomainFluidSettings", "override_time", "use_time_override"),
+    ("FluidFluidSettings", "export_animated_mesh", "use_animated_mesh"),
+    ("InflowFluidSettings", "export_animated_mesh", "use_animated_mesh"),
+    ("InflowFluidSettings", "local_coordinates", "use_local_coords"),
+    ("ObstacleFluidSettings", "export_animated_mesh", "use_animated_mesh"),
+    ("OutflowFluidSettings", "export_animated_mesh", "use_animated_mesh"),
+    ("ParticleFluidSettings", "drops", "use_drops"),
+    ("ParticleFluidSettings", "floats", "use_floats"),
+    ("Armature", "drawtype", "draw_type"),
+    ("Armature", "layer_protection", "layers_protected"),
+    ("Armature", "auto_ik", "use_auto_ik"),
+    ("Armature", "delay_deform", "use_deform_delay"),
+    ("Armature", "deform_envelope", "use_deform_envelopes"),
+    ("Armature", "deform_quaternion", "use_deform_preserve_volume"),
+    ("Armature", "deform_vertexgroups", "use_deform_vertex_groups"),
+    ("Armature", "x_axis_mirror", "use_mirror_x"),
+    ("Curve", "width", "offset"),
+    ("Image", "animation_speed", "fps"),
+    ("Image", "animation_end", "frame_end"),
+    ("Image", "animation_start", "frame_start"),
+    ("Image", "animated", "use_animation"),
+    ("Image", "clamp_x", "use_clamp_x"),
+    ("Image", "clamp_y", "use_clamp_y"),
+    ("Image", "premultiply", "use_premultiply"),
+    ("AreaLamp", "shadow_ray_sampling_method", "shadow_ray_sample_method"),
+    ("AreaLamp", "only_shadow", "use_only_shadow"),
+    ("AreaLamp", "shadow_layer", "use_shadow_layer"),
+    ("AreaLamp", "umbra", "use_umbra"),
+    ("PointLamp", "shadow_ray_sampling_method", "shadow_ray_sample_method"),
+    ("PointLamp", "only_shadow", "use_only_shadow"),
+    ("PointLamp", "shadow_layer", "use_shadow_layer"),
+    ("PointLamp", "sphere", "use_sphere"),
+    ("SpotLamp", "shadow_ray_sampling_method", "shadow_ray_sample_method"),
+    ("SpotLamp", "auto_clip_end", "use_auto_clip_end"),
+    ("SpotLamp", "auto_clip_start", "use_auto_clip_start"),
+    ("SpotLamp", "only_shadow", "use_only_shadow"),
+    ("SpotLamp", "shadow_layer", "use_shadow_layer"),
+    ("SpotLamp", "sphere", "use_sphere"),
+    ("SunLamp", "only_shadow", "use_only_shadow"),
+    ("SunLamp", "shadow_layer", "use_shadow_layer"),
+    ("Material", "z_offset", "offset_z"),
+    ("Material", "shadow_casting_alpha", "shadow_cast_alpha"),
+    ("Material", "cast_approximate", "use_cast_approximate"),
+    ("Material", "cast_buffer_shadows", "use_cast_buffer_shadows"),
+    ("Material", "cast_shadows_only", "use_cast_shadows_only"),
+    ("Material", "face_texture", "use_face_texture"),
+    ("Material", "face_texture_alpha", "use_face_texture_alpha"),
+    ("Material", "full_oversampling", "use_full_oversampling"),
+    ("Material", "light_group_exclusive", "use_light_group_exclusive"),
+    ("Material", "object_color", "use_object_color"),
+    ("Material", "only_shadow", "use_only_shadow"),
+    ("Material", "ray_shadow_bias", "use_ray_shadow_bias"),
+    ("Material", "traceable", "use_raytrace"),
+    ("Material", "shadeless", "use_shadeless"),
+    ("Material", "tangent_shading", "use_tangent_shading"),
+    ("Material", "transparency", "use_transparency"),
+    ("Material", "receive_transparent_shadows", "use_transparent_shadows"),
+    ("Material", "vertex_color_light", "use_vertex_color_light"),
+    ("Material", "vertex_color_paint", "use_vertex_color_paint"),
+    ("Mesh", "autosmooth_angle", "auto_smooth_angle"),
+    ("Mesh", "autosmooth", "use_auto_smooth"),
+    ("Object", "max_draw_type", "draw_type"),
+    ("Object", "use_dupli_verts_rotation", "use_dupli_vertices_rotation"),
+    ("Object", "shape_key_edit_mode", "use_shape_key_edit_mode"),
+    ("Object", "slow_parent", "use_slow_parent"),
+    ("Object", "time_offset_add_parent", "use_time_offset_add_parent"),
+    ("Object", "time_offset_edit", "use_time_offset_edit"),
+    ("Object", "time_offset_parent", "use_time_offset_parent"),
+    ("Object", "time_offset_particle", "use_time_offset_particle"),
+    ("ParticleSettings", "adaptive_pix", "adaptive_pixel"),
+    ("ParticleSettings", "child_effector", "apply_effector_to_children"),
+    ("ParticleSettings", "child_guide", "apply_guide_to_children"),
+    ("ParticleSettings", "billboard_split_offset", "billboard_offset_split"),
+    ("ParticleSettings", "billboard_random_tilt", "billboard_tilt_random"),
+    ("ParticleSettings", "child_length_thres", "child_length_threshold"),
+    ("ParticleSettings", "child_random_size", "child_size_random"),
+    ("ParticleSettings", "clumppow", "clump_shape"),
+    ("ParticleSettings", "damp_factor", "damping"),
+    ("ParticleSettings", "draw_as", "draw_method"),
+    ("ParticleSettings", "random_factor", "factor_random"),
+    ("ParticleSettings", "grid_invert", "invert_grid"),
+    ("ParticleSettings", "random_length", "length_random"),
+    ("ParticleSettings", "random_lifetime", "lifetime_random"),
+    ("ParticleSettings", "billboard_lock", "lock_billboard"),
+    ("ParticleSettings", "boids_2d", "lock_boids_to_surface"),
+    ("ParticleSettings", "object_aligned_factor", "object_align_factor"),
+    ("ParticleSettings", "random_phase_factor", "phase_factor_random"),
+    ("ParticleSettings", "ren_as", "render_type"),
+    ("ParticleSettings", "rendered_child_nbr", "rendered_child_count"),
+    ("ParticleSettings", "random_rotation_factor", "rotation_factor_random"),
+    ("ParticleSettings", "rough1", "roughness_1"),
+    ("ParticleSettings", "rough1_size", "roughness_1_size"),
+    ("ParticleSettings", "rough2", "roughness_2"),
+    ("ParticleSettings", "rough2_size", "roughness_2_size"),
+    ("ParticleSettings", "rough2_thres", "roughness_2_threshold"),
+    ("ParticleSettings", "rough_end_shape", "roughness_end_shape"),
+    ("ParticleSettings", "rough_endpoint", "roughness_endpoint"),
+    ("ParticleSettings", "random_size", "size_random"),
+    ("ParticleSettings", "abs_path_time", "use_absolute_path_time"),
+    ("ParticleSettings", "animate_branching", "use_animate_branching"),
+    ("ParticleSettings", "branching", "use_branching"),
+    ("ParticleSettings", "died", "use_dead"),
+    ("ParticleSettings", "die_on_collision", "use_die_on_collision"),
+    ("ParticleSettings", "rotation_dynamic", "use_dynamic_rotation"),
+    ("ParticleSettings", "even_distribution", "use_even_distribution"),
+    ("ParticleSettings", "rand_group", "use_group_pick_random"),
+    ("ParticleSettings", "hair_bspline", "use_hair_bspline"),
+    ("ParticleSettings", "sizemass", "use_multiply_size_mass"),
+    ("ParticleSettings", "react_multiple", "use_react_multiple"),
+    ("ParticleSettings", "react_start_end", "use_react_start_end"),
+    ("ParticleSettings", "render_adaptive", "use_render_adaptive"),
+    ("ParticleSettings", "self_effect", "use_self_effect"),
+    ("ParticleSettings", "enable_simplify", "use_simplify"),
+    ("ParticleSettings", "size_deflect", "use_size_deflect"),
+    ("ParticleSettings", "render_strand", "use_strand_primitive"),
+    ("ParticleSettings", "symmetric_branching", "use_symmetric_branching"),
+    ("ParticleSettings", "velocity_length", "use_velocity_length"),
+    ("ParticleSettings", "whole_group", "use_whole_group"),
+    ("CloudsTexture", "noise_size", "noise_scale"),
+    ("DistortedNoiseTexture", "noise_size", "noise_scale"),
+    ("EnvironmentMapTexture", "filter_size_minimum", "use_filter_size_min"),
+    ("EnvironmentMapTexture", "mipmap_gauss", "use_mipmap_gauss"),
+    ("ImageTexture", "calculate_alpha", "use_calculate_alpha"),
+    ("ImageTexture", "checker_even", "use_checker_even"),
+    ("ImageTexture", "checker_odd", "use_checker_odd"),
+    ("ImageTexture", "filter_size_minimum", "use_filter_size_min"),
+    ("ImageTexture", "flip_axis", "use_flip_axis"),
+    ("ImageTexture", "mipmap_gauss", "use_mipmap_gauss"),
+    ("ImageTexture", "mirror_x", "use_mirror_x"),
+    ("ImageTexture", "mirror_y", "use_mirror_y"),
+    ("ImageTexture", "normal_map", "use_normal_map"),
+    ("MarbleTexture", "noise_size", "noise_scale"),
+    ("MarbleTexture", "noisebasis2", "noise_basis_2"),
+    ("MarbleTexture", "noisebasis_2", "noise_basis_2"),
+    ("MusgraveTexture", "highest_dimension", "dimension_max"),
+    ("MusgraveTexture", "noise_size", "noise_scale"),
+    ("StucciTexture", "noise_size", "noise_scale"),
+    ("VoronoiTexture", "coloring", "color_mode"),
+    ("VoronoiTexture", "noise_size", "noise_scale"),
+    ("WoodTexture", "noise_size", "noise_scale"),
+    ("WoodTexture", "noisebasis2", "noise_basis_2"),
+    ("WoodTexture", "noisebasis_2", "noise_basis_2"),
+    ("World", "blend_sky", "use_sky_blend"),
+    ("World", "paper_sky", "use_sky_paper"),
+    ("World", "real_sky", "use_sky_real"),
+    ("ImageUser", "auto_refresh", "use_auto_refresh"),
+    ("MaterialHalo", "flares_sub", "flare_subflare_count"),
+    ("MaterialHalo", "flare_subsize", "flare_subflare_size"),
+    ("MaterialHalo", "line_number", "line_count"),
+    ("MaterialHalo", "rings", "ring_count"),
+    ("MaterialHalo", "star_tips", "star_tip_count"),
+    ("MaterialHalo", "xalpha", "use_extreme_alpha"),
+    ("MaterialHalo", "flare_mode", "use_flare_mode"),
+    ("MaterialHalo", "vertex_normal", "use_vertex_normal"),
+    ("MaterialPhysics", "align_to_normal", "use_normal_align"),
+    ("MaterialStrand", "min_size", "size_min"),
+    ("MaterialStrand", "blender_units", "use_blender_units"),
+    ("MaterialStrand", "surface_diffuse", "use_surface_diffuse"),
+    ("MaterialStrand", "tangent_shading", "use_tangent_shading"),
+    ("MaterialSubsurfaceScattering", "error_tolerance", "error_threshold"),
+    ("MaterialVolume", "depth_cutoff", "depth_threshold"),
+    ("MaterialVolume", "lighting_mode", "light_method"),
+    ("MaterialVolume", "step_calculation", "step_method"),
+    ("MaterialVolume", "external_shadows", "use_external_shadows"),
+    ("MaterialVolume", "light_cache", "use_light_cache"),
+    ("ArmatureModifier", "multi_modifier", "use_multi_modifier"),
+    ("ArrayModifier", "constant_offset_displacement", "constant_offset_displace"),
+    ("ArrayModifier", "merge_distance", "merge_threshold"),
+    ("ArrayModifier", "relative_offset_displacement", "relative_offset_displace"),
+    ("ArrayModifier", "constant_offset", "use_constant_offset"),
+    ("ArrayModifier", "merge_adjacent_vertices", "use_merge_vertices"),
+    ("ArrayModifier", "merge_end_vertices", "use_merge_vertices_cap"),
+    ("ArrayModifier", "add_offset_object", "use_object_offset"),
+    ("ArrayModifier", "relative_offset", "use_relative_offset"),
+    ("BevelModifier", "only_vertices", "use_only_vertices"),
+    ("CastModifier", "from_radius", "use_radius_as_size"),
+    ("DisplaceModifier", "midlevel", "mid_level"),
+    ("DisplaceModifier", "texture_coordinates", "texture_coords"),
+    ("EdgeSplitModifier", "use_sharp", "use_edge_sharp"),
+    ("ExplodeModifier", "split_edges", "use_edge_split"),
+    ("MirrorModifier", "merge_limit", "merge_threshold"),
+    ("MirrorModifier", "mirror_u", "use_mirror_u"),
+    ("MirrorModifier", "mirror_v", "use_mirror_v"),
+    ("MirrorModifier", "mirror_vertex_groups", "use_mirror_vertex_groups"),
+    ("ParticleInstanceModifier", "particle_system_number", "particle_system_index"),
+    ("ParticleInstanceModifier", "keep_shape", "use_preserve_shape"),
+    ("ShrinkwrapModifier", "cull_back_faces", "use_cull_back_faces"),
+    ("ShrinkwrapModifier", "cull_front_faces", "use_cull_front_faces"),
+    ("ShrinkwrapModifier", "keep_above_surface", "use_keep_above_surface"),
+    ("SimpleDeformModifier", "lock_x_axis", "lock_x"),
+    ("SimpleDeformModifier", "lock_y_axis", "lock_y"),
+    ("SmokeModifier", "smoke_type", "type"),
+    ("SubsurfModifier", "subsurf_uv", "use_subsurf_uv"),
+    ("UVProjectModifier", "num_projectors", "projector_count"),
+    ("UVProjectModifier", "override_image", "use_image_override"),
+    ("WaveModifier", "texture_coordinates", "texture_coords"),
+    ("WaveModifier", "x_normal", "use_normal_x"),
+    ("WaveModifier", "y_normal", "use_normal_y"),
+    ("WaveModifier", "z_normal", "use_normal_z"),
+    ("NlaStrip", "blending", "blend_type"),
+    ("NlaStrip", "animated_influence", "use_animated_influence"),
+    ("NlaStrip", "animated_time", "use_animated_time"),
+    ("NlaStrip", "animated_time_cyclic", "use_animated_time_cyclic"),
+    ("NlaStrip", "auto_blending", "use_auto_blend"),
+    ("CompositorNodeAlphaOver", "convert_premul", "use_premultiply"),
+    ("CompositorNodeBlur", "sizex", "size_x"),
+    ("CompositorNodeBlur", "sizey", "size_y"),
+    ("CompositorNodeChannelMatte", "algorithm", "limit_method"),
+    ("CompositorNodeChromaMatte", "acceptance", "tolerance"),
+    ("CompositorNodeColorBalance", "correction_formula", "correction_method"),
+    ("CompositorNodeColorSpill", "algorithm", "limit_method"),
+    ("CompositorNodeColorSpill", "unspill", "use_unspill"),
+    ("CompositorNodeCrop", "x2", "max_x"),
+    ("CompositorNodeCrop", "y2", "max_y"),
+    ("CompositorNodeCrop", "x1", "min_x"),
+    ("CompositorNodeCrop", "y1", "min_y"),
+    ("CompositorNodeCrop", "crop_size", "use_crop_size"),
+    ("CompositorNodeDefocus", "max_blur", "blur_max"),
+    ("CompositorNodeDefocus", "gamma_correction", "use_gamma_correction"),
+    ("CompositorNodeGlare", "rotate_45", "use_rotate_45"),
+    ("CompositorNodeImage", "auto_refresh", "use_auto_refresh"),
+    ("CompositorNodeLensdist", "projector", "use_projector"),
+    ("CompositorNodeVecBlur", "max_speed", "speed_max"),
+    ("CompositorNodeVecBlur", "min_speed", "speed_min"),
+    ("ShaderNodeMapping", "maximum", "max"),
+    ("ShaderNodeMapping", "minimum", "min"),
+    ("ShaderNodeMapping", "clamp_maximum", "use_max"),
+    ("ShaderNodeMapping", "clamp_minimum", "use_min"),
+    ("VertexPaint", "all_faces", "use_all_faces"),
+    ("VertexPaint", "spray", "use_spray"),
+    ("ParticleEdit", "add_keys", "default_key_count"),
+    ("ParticleEdit", "selection_mode", "select_mode"),
+    ("ParticleEdit", "auto_velocity", "use_auto_velocity"),
+    ("ParticleEdit", "add_interpolate", "use_default_interpolate"),
+    ("ParticleEdit", "emitter_deflect", "use_emitter_deflect"),
+    ("ParticleEdit", "fade_time", "use_fade_time"),
+    ("ParticleEdit", "keep_lengths", "use_preserve_length"),
+    ("ParticleEdit", "keep_root", "use_preserve_root"),
+    ("ParticleSystem", "vertex_group_clump_negate", "invert_vertex_group_clump"),
+    ("ParticleSystem", "vertex_group_density_negate", "invert_vertex_group_density"),
+    ("ParticleSystem", "vertex_group_field_negate", "invert_vertex_group_field"),
+    ("ParticleSystem", "vertex_group_kink_negate", "invert_vertex_group_kink"),
+    ("ParticleSystem", "vertex_group_length_negate", "invert_vertex_group_length"),
+    ("ParticleSystem", "vertex_group_rotation_negate", "invert_vertex_group_rotation"),
+    ("ParticleSystem", "vertex_group_roughness1_negate", "invert_vertex_group_roughness_1"),
+    ("ParticleSystem", "vertex_group_roughness2_negate", "invert_vertex_group_roughness_2"),
+    ("ParticleSystem", "vertex_group_roughness_end_negate", "invert_vertex_group_roughness_end"),
+    ("ParticleSystem", "vertex_group_size_negate", "invert_vertex_group_size"),
+    ("ParticleSystem", "vertex_group_tangent_negate", "invert_vertex_group_tangent"),
+    ("ParticleSystem", "vertex_group_velocity_negate", "invert_vertex_group_velocity"),
+    ("ParticleSystem", "hair_dynamics", "use_hair_dynamics"),
+    ("ParticleSystem", "keyed_timing", "use_keyed_timing"),
+    ("PointDensity", "falloff_softness", "falloff_soft"),
+    ("PointDensity", "particle_cache", "particle_cache_space"),
+    ("PointDensity", "turbulence_size", "turbulence_scale"),
+    ("PointDensity", "turbulence", "use_turbulence"),
+    ("PointDensity", "vertices_cache", "vertex_cache_space"),
+    ("PoseBone", "ik_lin_weight", "ik_linear_weight"),
+    ("PoseBone", "ik_rot_weight", "ik_rotation_weight"),
+    ("PoseBone", "ik_limit_x", "use_ik_limit_x"),
+    ("PoseBone", "ik_limit_y", "use_ik_limit_y"),
+    ("PoseBone", "ik_limit_z", "use_ik_limit_z"),
+    ("PoseBone", "ik_lin_control", "use_ik_linear_control"),
+    ("PoseBone", "ik_rot_control", "use_ik_rotation_control"),
+    ("Bone", "use_hinge", "use_inherit_rotation"),
+    ("SPHFluidSettings", "spring_k", "spring_force"),
+    ("SPHFluidSettings", "stiffness_k", "stiffness"),
+    ("SPHFluidSettings", "stiffness_knear", "stiffness_near"),
+    ("SceneGameData", "framing_color", "frame_color"),
+    ("SceneGameData", "framing_type", "frame_type"),
+    ("SceneGameData", "eye_separation", "stereo_eye_separation"),
+    ("SceneGameData", "activity_culling", "use_activity_culling"),
+    ("SceneGameData", "auto_start", "use_auto_start"),
+    ("SceneGameData", "glsl_extra_textures", "use_glsl_extra_textures"),
+    ("SceneGameData", "glsl_lights", "use_glsl_lights"),
+    ("SceneGameData", "glsl_nodes", "use_glsl_nodes"),
+    ("SceneGameData", "glsl_ramps", "use_glsl_ramps"),
+    ("SceneGameData", "glsl_shaders", "use_glsl_shaders"),
+    ("SceneGameData", "glsl_shadows", "use_glsl_shadows"),
+    ("Sequence", "blend_opacity", "blend_alpha"),
+    ("Sequence", "blend_mode", "blend_type"),
+    ("Sequence", "frame_final_length", "frame_final_duration"),
+    ("Sequence", "use_effect_default_fade", "use_default_fade"),
+    ("SequenceColorBalance", "inverse_gain", "invert_gain"),
+    ("SequenceColorBalance", "inverse_gamma", "invert_gamma"),
+    ("SequenceColorBalance", "inverse_lift", "invert_lift"),
+    ("EffectSequence", "multiply_colors", "color_multiply"),
+    ("EffectSequence", "de_interlace", "use_deinterlace"),
+    ("EffectSequence", "flip_x", "use_flip_x"),
+    ("EffectSequence", "flip_y", "use_flip_y"),
+    ("EffectSequence", "convert_float", "use_float"),
+    ("EffectSequence", "premultiply", "use_premultiply"),
+    ("EffectSequence", "proxy_custom_directory", "use_proxy_custom_directory"),
+    ("EffectSequence", "proxy_custom_file", "use_proxy_custom_file"),
+    ("EffectSequence", "reverse_frames", "use_reverse_frames"),
+    ("GlowSequence", "blur_distance", "blur_radius"),
+    ("GlowSequence", "only_boost", "use_only_boost"),
+    ("SpeedControlSequence", "curve_compress_y", "use_curve_compress_y"),
+    ("SpeedControlSequence", "curve_velocity", "use_curve_velocity"),
+    ("SpeedControlSequence", "frame_blending", "use_frame_blend"),
+    ("TransformSequence", "uniform_scale", "use_uniform_scale"),
+    ("ImageSequence", "animation_end_offset", "animation_offset_end"),
+    ("ImageSequence", "animation_start_offset", "animation_offset_start"),
+    ("ImageSequence", "multiply_colors", "color_multiply"),
+    ("ImageSequence", "de_interlace", "use_deinterlace"),
+    ("ImageSequence", "flip_x", "use_flip_x"),
+    ("ImageSequence", "flip_y", "use_flip_y"),
+    ("ImageSequence", "convert_float", "use_float"),
+    ("ImageSequence", "premultiply", "use_premultiply"),
+    ("ImageSequence", "proxy_custom_directory", "use_proxy_custom_directory"),
+    ("ImageSequence", "proxy_custom_file", "use_proxy_custom_file"),
+    ("ImageSequence", "reverse_frames", "use_reverse_frames"),
+    ("MetaSequence", "animation_end_offset", "animation_offset_end"),
+    ("MetaSequence", "animation_start_offset", "animation_offset_start"),
+    ("MetaSequence", "multiply_colors", "color_multiply"),
+    ("MetaSequence", "de_interlace", "use_deinterlace"),
+    ("MetaSequence", "flip_x", "use_flip_x"),
+    ("MetaSequence", "flip_y", "use_flip_y"),
+    ("MetaSequence", "convert_float", "use_float"),
+    ("MetaSequence", "premultiply", "use_premultiply"),
+    ("MetaSequence", "proxy_custom_directory", "use_proxy_custom_directory"),
+    ("MetaSequence", "proxy_custom_file", "use_proxy_custom_file"),
+    ("MetaSequence", "reverse_frames", "use_reverse_frames"),
+    ("MovieSequence", "animation_end_offset", "animation_offset_end"),
+    ("MovieSequence", "animation_start_offset", "animation_offset_start"),
+    ("MovieSequence", "multiply_colors", "color_multiply"),
+    ("MovieSequence", "de_interlace", "use_deinterlace"),
+    ("MovieSequence", "flip_x", "use_flip_x"),
+    ("MovieSequence", "flip_y", "use_flip_y"),
+    ("MovieSequence", "convert_float", "use_float"),
+    ("MovieSequence", "premultiply", "use_premultiply"),
+    ("MovieSequence", "proxy_custom_directory", "use_proxy_custom_directory"),
+    ("MovieSequence", "proxy_custom_file", "use_proxy_custom_file"),
+    ("MovieSequence", "reverse_frames", "use_reverse_frames"),
+    ("MulticamSequence", "animation_end_offset", "animation_offset_end"),
+    ("MulticamSequence", "animation_start_offset", "animation_offset_start"),
+    ("MulticamSequence", "multiply_colors", "color_multiply"),
+    ("MulticamSequence", "de_interlace", "use_deinterlace"),
+    ("MulticamSequence", "flip_x", "use_flip_x"),
+    ("MulticamSequence", "flip_y", "use_flip_y"),
+    ("MulticamSequence", "convert_float", "use_float"),
+    ("MulticamSequence", "premultiply", "use_premultiply"),
+    ("MulticamSequence", "proxy_custom_directory", "use_proxy_custom_directory"),
+    ("MulticamSequence", "proxy_custom_file", "use_proxy_custom_file"),
+    ("MulticamSequence", "reverse_frames", "use_reverse_frames"),
+    ("SceneSequence", "animation_end_offset", "animation_offset_end"),
+    ("SceneSequence", "animation_start_offset", "animation_offset_start"),
+    ("SceneSequence", "multiply_colors", "color_multiply"),
+    ("SceneSequence", "de_interlace", "use_deinterlace"),
+    ("SceneSequence", "flip_x", "use_flip_x"),
+    ("SceneSequence", "flip_y", "use_flip_y"),
+    ("SceneSequence", "convert_float", "use_float"),
+    ("SceneSequence", "premultiply", "use_premultiply"),
+    ("SceneSequence", "proxy_custom_directory", "use_proxy_custom_directory"),
+    ("SceneSequence", "proxy_custom_file", "use_proxy_custom_file"),
+    ("SceneSequence", "reverse_frames", "use_reverse_frames"),
+    ("SoundSequence", "animation_end_offset", "animation_offset_end"),
+    ("SoundSequence", "animation_start_offset", "animation_offset_start"),
+    ("SmokeDomainSettings", "smoke_domain_colli", "collision_extents"),
+    ("SmokeDomainSettings", "smoke_cache_high_comp", "point_cache_compress_high_type"),
+    ("SmokeDomainSettings", "smoke_cache_comp", "point_cache_compress_type"),
+    ("SmokeDomainSettings", "maxres", "resolution_max"),
+    ("SmokeDomainSettings", "smoothemitter", "smooth_emitter"),
+    ("SmokeDomainSettings", "dissolve_smoke", "use_dissolve_smoke"),
+    ("SmokeDomainSettings", "dissolve_smoke_log", "use_dissolve_smoke_log"),
+    ("SmokeDomainSettings", "highres", "use_high_resolution"),
+    ("SoftBodySettings", "bending", "bend"),
+    ("SoftBodySettings", "error_limit", "error_threshold"),
+    ("SoftBodySettings", "lcom", "location_mass_center"),
+    ("SoftBodySettings", "lrot", "rotation_estimate"),
+    ("SoftBodySettings", "lscale", "scale_estimate"),
+    ("SoftBodySettings", "maxstep", "step_max"),
+    ("SoftBodySettings", "minstep", "step_min"),
+    ("SoftBodySettings", "diagnose", "use_diagnose"),
+    ("SoftBodySettings", "edge_collision", "use_edge_collision"),
+    ("SoftBodySettings", "estimate_matrix", "use_estimate_matrix"),
+    ("SoftBodySettings", "face_collision", "use_face_collision"),
+    ("SoftBodySettings", "self_collision", "use_self_collision"),
+    ("SoftBodySettings", "stiff_quads", "use_stiff_quads"),
+    ("TexMapping", "maximum", "max"),
+    ("TexMapping", "minimum", "min"),
+    ("TexMapping", "has_maximum", "use_max"),
+    ("TexMapping", "has_minimum", "use_min"),
+    ("TextCharacterFormat", "bold", "use_bold"),
+    ("TextCharacterFormat", "italic", "use_italic"),
+    ("TextCharacterFormat", "underline", "use_underline"),
+    ("TextureSlot", "rgb_to_intensity", "use_rgb_to_intensity"),
+    ("TextureSlot", "stencil", "use_stencil"),
+    ("LampTextureSlot", "texture_coordinates", "texture_coords"),
+    ("LampTextureSlot", "map_color", "use_map_color"),
+    ("LampTextureSlot", "map_shadow", "use_map_shadow"),
+    ("MaterialTextureSlot", "coloremission_factor", "color_emission_factor"),
+    ("MaterialTextureSlot", "colordiff_factor", "diffuse_color_factor"),
+    ("MaterialTextureSlot", "x_mapping", "mapping_x"),
+    ("MaterialTextureSlot", "y_mapping", "mapping_y"),
+    ("MaterialTextureSlot", "z_mapping", "mapping_z"),
+    ("MaterialTextureSlot", "colorreflection_factor", "reflection_color_factor"),
+    ("MaterialTextureSlot", "colorspec_factor", "specular_color_factor"),
+    ("MaterialTextureSlot", "texture_coordinates", "texture_coords"),
+    ("MaterialTextureSlot", "colortransmission_factor", "transmission_color_factor"),
+    ("MaterialTextureSlot", "from_dupli", "use_from_dupli"),
+    ("MaterialTextureSlot", "from_original", "use_from_original"),
+    ("MaterialTextureSlot", "map_alpha", "use_map_alpha"),
+    ("MaterialTextureSlot", "map_ambient", "use_map_ambient"),
+    ("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"),
+    ("MaterialTextureSlot", "map_colortransmission", "use_map_color_transmission"),
+    ("MaterialTextureSlot", "map_density", "use_map_density"),
+    ("MaterialTextureSlot", "map_diffuse", "use_map_diffuse"),
+    ("MaterialTextureSlot", "map_displacement", "use_map_displacement"),
+    ("MaterialTextureSlot", "map_emission", "use_map_emission"),
+    ("MaterialTextureSlot", "map_emit", "use_map_emit"),
+    ("MaterialTextureSlot", "map_hardness", "use_map_hardness"),
+    ("MaterialTextureSlot", "map_mirror", "use_map_mirror"),
+    ("MaterialTextureSlot", "map_normal", "use_map_normal"),
+    ("MaterialTextureSlot", "map_raymir", "use_map_raymir"),
+    ("MaterialTextureSlot", "map_reflection", "use_map_reflect"),
+    ("MaterialTextureSlot", "map_scattering", "use_map_scatter"),
+    ("MaterialTextureSlot", "map_specular", "use_map_specular"),
+    ("MaterialTextureSlot", "map_translucency", "use_map_translucency"),
+    ("MaterialTextureSlot", "map_warp", "use_map_warp"),
+    ("WorldTextureSlot", "texture_coordinates", "texture_coords"),
+    ("WorldTextureSlot", "map_blend", "use_map_blend"),
+    ("WorldTextureSlot", "map_horizon", "use_map_horizon"),
+    ("WorldTextureSlot", "map_zenith_down", "use_map_zenith_down"),
+    ("WorldTextureSlot", "map_zenith_up", "use_map_zenith_up"),
+    ("VoxelData", "still_frame_number", "still_frame"),
+    ("WorldLighting", "ao_blend_mode", "ao_blend_type"),
+    ("WorldLighting", "error_tolerance", "error_threshold"),
+    ("WorldLighting", "use_ambient_occlusion", "use_ambient_occlusian"),
+    ("WorldLighting", "pixel_cache", "use_cache"),
+    ("WorldLighting", "use_environment_lighting", "use_environment_light"),
+    ("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"),
+    ("SoftBodySettings", "damp", "damping"),
+    ("SequenceCrop", "right", "max_x"),
+    ("SequenceCrop", "top", "max_y"),
+    ("SequenceCrop", "bottom", "min_x"),
+    ("SequenceCrop", "left", "min_y"),
+    ("Sequence", "speed_fader", "speed_factor"),
+    ("SpeedControlSequence", "global_speed", "multiply_speed"),
+    ("SpeedControlSequence", "use_curve_velocity", "use_as_speed"),
+    ("SpeedControlSequence", "use_curve_compress_y", "scale_to_length"),
+    ("Key", "keys", "key_blocks"),
+    )
+
+
 if __name__ == "__main__":
 
     # Example, should be called externally
index f5f8b9923567af16bdd7d7256f7d833bc29bd9d8..c0e83cee9d685c4c09a6d9efe865518705dfd2cf 100644 (file)
@@ -25,7 +25,6 @@ if "bpy" in locals():
 _modules = (
     "add_mesh_torus",
     "anim",
-    "animsys_update",
     "console",
     "image",
     "mesh",
index 660194abf8c2febe4c460ad324e451f58f378295..7d1f3b8f5f06472221ab6c2afbd7938e4c61d935 100644 (file)
@@ -25,7 +25,11 @@ if "bpy" in locals():
 
 import bpy
 from bpy.types import Operator
-from bpy.props import IntProperty, BoolProperty, EnumProperty
+from bpy.props import (IntProperty,
+                       BoolProperty,
+                       EnumProperty,
+                       StringProperty,
+                       )
 
 
 class ANIM_OT_keying_set_export(Operator):
@@ -33,10 +37,24 @@ class ANIM_OT_keying_set_export(Operator):
     bl_idname = "anim.keying_set_export"
     bl_label = "Export Keying Set..."
 
-    filepath = bpy.props.StringProperty(name="File Path", description="Filepath to write file to")
-    filter_folder = bpy.props.BoolProperty(name="Filter folders", description="", default=True, options={'HIDDEN'})
-    filter_text = bpy.props.BoolProperty(name="Filter text", description="", default=True, options={'HIDDEN'})
-    filter_python = bpy.props.BoolProperty(name="Filter python", description="", default=True, options={'HIDDEN'})
+    filepath = StringProperty(
+            name="File Path",
+            )
+    filter_folder = BoolProperty(
+            name="Filter folders",
+            default=True,
+            options={'HIDDEN'},
+            )
+    filter_text = BoolProperty(
+            name="Filter text",
+            default=True,
+            options={'HIDDEN'},
+            )
+    filter_python = BoolProperty(
+            name="Filter python",
+            default=True,
+            options={'HIDDEN'},
+            )
 
     def execute(self, context):
         if not self.filepath:
@@ -52,7 +70,8 @@ class ANIM_OT_keying_set_export(Operator):
         f.write("# Keying Set: %s\n" % ks.name)
 
         f.write("import bpy\n\n")
-        f.write("scene= bpy.data.scenes[0]\n\n")  # XXX, why not use the current scene?
+        # XXX, why not current scene?
+        f.write("scene= bpy.data.scenes[0]\n\n")
 
         # Add KeyingSet and set general settings
         f.write("# Keying Set Level declarations\n")
@@ -65,8 +84,11 @@ class ANIM_OT_keying_set_export(Operator):
         f.write("ks.bl_options = %r\n" % ks.bl_options)
         f.write("\n")
 
+        # --------------------------------------------------------
         # generate and write set of lookups for id's used in paths
-        id_to_paths_cache = {}  # cache for syncing ID-blocks to bpy paths + shorthands
+
+        # cache for syncing ID-blocks to bpy paths + shorthands
+        id_to_paths_cache = {}
 
         for ksp in ks.paths:
             if ksp.id is None:
@@ -74,11 +96,14 @@ class ANIM_OT_keying_set_export(Operator):
             if ksp.id in id_to_paths_cache:
                 continue
 
-            # - idtype_list is used to get the list of id-datablocks from bpy.data.*
-            #   since this info isn't available elsewhere
-            # - id.bl_rna.name gives a name suitable for UI,
-            #   with a capitalised first letter, but we need
-            #   the plural form that's all lower case
+            """
+            - idtype_list is used to get the list of id-datablocks from
+              bpy.data.* since this info isn't available elsewhere
+            - id.bl_rna.name gives a name suitable for UI,
+              with a capitalised first letter, but we need
+              the plural form that's all lower case
+            """
+
             idtype_list = ksp.id.bl_rna.name.lower() + "s"
             id_bpy_path = "bpy.data.%s[\"%s\"]" % (idtype_list, ksp.id.name)
 
@@ -113,9 +138,11 @@ class ANIM_OT_keying_set_export(Operator):
                 f.write(", index=%d" % ksp.array_index)
 
             # grouping settings (if applicable)
-            # NOTE: the current default is KEYINGSET, but if this changes, change this code too
+            # NOTE: the current default is KEYINGSET, but if this changes,
+            # change this code too
             if ksp.group_method == 'NAMED':
-                f.write(", group_method='%s', group_name=\"%s\"" % (ksp.group_method, ksp.group))
+                f.write(", group_method='%s', group_name=\"%s\"" %
+                        (ksp.group_method, ksp.group))
             elif ksp.group_method != 'KEYINGSET':
                 f.write(", group_method='%s'" % ksp.group_method)
 
@@ -134,7 +161,7 @@ class ANIM_OT_keying_set_export(Operator):
 
 
 class BakeAction(Operator):
-    '''Bake animation to an Action'''
+    """Bake animation to an Action"""
     bl_idname = "nla.bake"
     bl_label = "Bake Action"
     bl_options = {'REGISTER', 'UNDO'}
@@ -200,8 +227,8 @@ class BakeAction(Operator):
 
 
 class ClearUselessActions(Operator):
-    '''Mark actions with no F-Curves for deletion after save+reload of ''' \
-    '''file preserving "action libraries"'''
+    """Mark actions with no F-Curves for deletion after save+reload of """ \
+    """file preserving "action libraries"""
     bl_idname = "anim.clear_useless_actions"
     bl_label = "Clear Useless Actions"
     bl_options = {'REGISTER', 'UNDO'}
@@ -233,3 +260,15 @@ class ClearUselessActions(Operator):
         self.report({'INFO'}, "Removed %d empty and/or fake-user only Actions"
                               % removed)
         return {'FINISHED'}
+
+
+class UpdateAnimData(Operator):
+    """Update data paths from 2.56 and previous versions, """ \
+    """modifying data paths of drivers and fcurves"""
+    bl_idname = "anim.update_data_paths"
+    bl_label = "Update Animation Data"
+
+    def execute(self, context):
+        import animsys_refactor
+        animsys_refactor.update_data_paths(animsys_refactor.data_2_56_to_2_59)
+        return {'FINISHED'}
diff --git a/release/scripts/startup/bl_operators/animsys_update.py b/release/scripts/startup/bl_operators/animsys_update.py
deleted file mode 100644 (file)
index 23b9cf1..0000000
+++ /dev/null
@@ -1,699 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-data_path_update = [
-    ("ClothCollisionSettings", "min_distance", "distance_min"),
-    ("ClothCollisionSettings", "self_min_distance", "self_distance_min"),
-    ("ClothCollisionSettings", "enable_collision", "use_collision"),
-    ("ClothCollisionSettings", "enable_self_collision", "use_self_collision"),
-    ("ClothSettings", "pin_cloth", "use_pin_cloth"),
-    ("ClothSettings", "stiffness_scaling", "use_stiffness_scale"),
-    ("CollisionSettings", "random_damping", "damping_random"),
-    ("CollisionSettings", "random_friction", "friction_random"),
-    ("CollisionSettings", "inner_thickness", "thickness_inner"),
-    ("CollisionSettings", "outer_thickness", "thickness_outer"),
-    ("CollisionSettings", "kill_particles", "use_particle_kill"),
-    ("Constraint", "proxy_local", "is_proxy_local"),
-    ("ActionConstraint", "maximum", "max"),
-    ("ActionConstraint", "minimum", "min"),
-    ("FollowPathConstraint", "use_fixed_position", "use_fixed_location"),
-    ("KinematicConstraint", "chain_length", "chain_count"),
-    ("KinematicConstraint", "pos_lock_x", "lock_location_x"),
-    ("KinematicConstraint", "pos_lock_y", "lock_location_y"),
-    ("KinematicConstraint", "pos_lock_z", "lock_location_z"),
-    ("KinematicConstraint", "rot_lock_x", "lock_rotation_x"),
-    ("KinematicConstraint", "rot_lock_y", "lock_rotation_y"),
-    ("KinematicConstraint", "rot_lock_z", "lock_rotation_z"),
-    ("KinematicConstraint", "axis_reference", "reference_axis"),
-    ("KinematicConstraint", "use_position", "use_location"),
-    ("LimitLocationConstraint", "maximum_x", "max_x"),
-    ("LimitLocationConstraint", "maximum_y", "max_y"),
-    ("LimitLocationConstraint", "maximum_z", "max_z"),
-    ("LimitLocationConstraint", "minimum_x", "min_x"),
-    ("LimitLocationConstraint", "minimum_y", "min_y"),
-    ("LimitLocationConstraint", "minimum_z", "min_z"),
-    ("LimitLocationConstraint", "use_maximum_x", "use_max_x"),
-    ("LimitLocationConstraint", "use_maximum_y", "use_max_y"),
-    ("LimitLocationConstraint", "use_maximum_z", "use_max_z"),
-    ("LimitLocationConstraint", "use_minimum_x", "use_min_x"),
-    ("LimitLocationConstraint", "use_minimum_y", "use_min_y"),
-    ("LimitLocationConstraint", "use_minimum_z", "use_min_z"),
-    ("LimitLocationConstraint", "limit_transform", "use_transform_limit"),
-    ("LimitRotationConstraint", "maximum_x", "max_x"),
-    ("LimitRotationConstraint", "maximum_y", "max_y"),
-    ("LimitRotationConstraint", "maximum_z", "max_z"),
-    ("LimitRotationConstraint", "minimum_x", "min_x"),
-    ("LimitRotationConstraint", "minimum_y", "min_y"),
-    ("LimitRotationConstraint", "minimum_z", "min_z"),
-    ("LimitRotationConstraint", "limit_transform", "use_transform_limit"),
-    ("LimitScaleConstraint", "maximum_x", "max_x"),
-    ("LimitScaleConstraint", "maximum_y", "max_y"),
-    ("LimitScaleConstraint", "maximum_z", "max_z"),
-    ("LimitScaleConstraint", "minimum_x", "min_x"),
-    ("LimitScaleConstraint", "minimum_y", "min_y"),
-    ("LimitScaleConstraint", "minimum_z", "min_z"),
-    ("LimitScaleConstraint", "use_maximum_x", "use_max_x"),
-    ("LimitScaleConstraint", "use_maximum_y", "use_max_y"),
-    ("LimitScaleConstraint", "use_maximum_z", "use_max_z"),
-    ("LimitScaleConstraint", "use_minimum_x", "use_min_x"),
-    ("LimitScaleConstraint", "use_minimum_y", "use_min_y"),
-    ("LimitScaleConstraint", "use_minimum_z", "use_min_z"),
-    ("LimitScaleConstraint", "limit_transform", "use_transform_limit"),
-    ("PivotConstraint", "enabled_rotation_range", "rotation_range"),
-    ("PivotConstraint", "use_relative_position", "use_relative_location"),
-    ("PythonConstraint", "number_of_targets", "target_count"),
-    ("SplineIKConstraint", "chain_length", "chain_count"),
-    ("SplineIKConstraint", "chain_offset", "use_chain_offset"),
-    ("SplineIKConstraint", "even_divisions", "use_even_divisions"),
-    ("SplineIKConstraint", "y_stretch", "use_y_stretch"),
-    ("SplineIKConstraint", "xz_scaling_mode", "xz_scale_mode"),
-    ("StretchToConstraint", "original_length", "rest_length"),
-    ("TrackToConstraint", "target_z", "use_target_z"),
-    ("TransformConstraint", "extrapolate_motion", "use_motion_extrapolate"),
-    ("FieldSettings", "do_location", "apply_to_location"),
-    ("FieldSettings", "do_rotation", "apply_to_rotation"),
-    ("FieldSettings", "maximum_distance", "distance_max"),
-    ("FieldSettings", "minimum_distance", "distance_min"),
-    ("FieldSettings", "radial_maximum", "radial_max"),
-    ("FieldSettings", "radial_minimum", "radial_min"),
-    ("FieldSettings", "force_2d", "use_2d_force"),
-    ("FieldSettings", "do_absorption", "use_absorption"),
-    ("FieldSettings", "global_coordinates", "use_global_coords"),
-    ("FieldSettings", "guide_path_add", "use_guide_path_add"),
-    ("FieldSettings", "multiple_springs", "use_multiple_springs"),
-    ("FieldSettings", "use_coordinates", "use_object_coords"),
-    ("FieldSettings", "root_coordinates", "use_root_coords"),
-    ("ControlFluidSettings", "reverse_frames", "use_reverse_frames"),
-    ("DomainFluidSettings", "real_world_size", "simulation_scale"),
-    ("DomainFluidSettings", "surface_smoothing", "surface_smooth"),
-    ("DomainFluidSettings", "reverse_frames", "use_reverse_frames"),
-    ("DomainFluidSettings", "generate_speed_vectors", "use_speed_vectors"),
-    ("DomainFluidSettings", "override_time", "use_time_override"),
-    ("FluidFluidSettings", "export_animated_mesh", "use_animated_mesh"),
-    ("InflowFluidSettings", "export_animated_mesh", "use_animated_mesh"),
-    ("InflowFluidSettings", "local_coordinates", "use_local_coords"),
-    ("ObstacleFluidSettings", "export_animated_mesh", "use_animated_mesh"),
-    ("OutflowFluidSettings", "export_animated_mesh", "use_animated_mesh"),
-    ("ParticleFluidSettings", "drops", "use_drops"),
-    ("ParticleFluidSettings", "floats", "use_floats"),
-    ("Armature", "drawtype", "draw_type"),
-    ("Armature", "layer_protection", "layers_protected"),
-    ("Armature", "auto_ik", "use_auto_ik"),
-    ("Armature", "delay_deform", "use_deform_delay"),
-    ("Armature", "deform_envelope", "use_deform_envelopes"),
-    ("Armature", "deform_quaternion", "use_deform_preserve_volume"),
-    ("Armature", "deform_vertexgroups", "use_deform_vertex_groups"),
-    ("Armature", "x_axis_mirror", "use_mirror_x"),
-    ("Curve", "width", "offset"),
-    ("Image", "animation_speed", "fps"),
-    ("Image", "animation_end", "frame_end"),
-    ("Image", "animation_start", "frame_start"),
-    ("Image", "animated", "use_animation"),
-    ("Image", "clamp_x", "use_clamp_x"),
-    ("Image", "clamp_y", "use_clamp_y"),
-    ("Image", "premultiply", "use_premultiply"),
-    ("AreaLamp", "shadow_ray_sampling_method", "shadow_ray_sample_method"),
-    ("AreaLamp", "only_shadow", "use_only_shadow"),
-    ("AreaLamp", "shadow_layer", "use_shadow_layer"),
-    ("AreaLamp", "umbra", "use_umbra"),
-    ("PointLamp", "shadow_ray_sampling_method", "shadow_ray_sample_method"),
-    ("PointLamp", "only_shadow", "use_only_shadow"),
-    ("PointLamp", "shadow_layer", "use_shadow_layer"),
-    ("PointLamp", "sphere", "use_sphere"),
-    ("SpotLamp", "shadow_ray_sampling_method", "shadow_ray_sample_method"),
-    ("SpotLamp", "auto_clip_end", "use_auto_clip_end"),
-    ("SpotLamp", "auto_clip_start", "use_auto_clip_start"),
-    ("SpotLamp", "only_shadow", "use_only_shadow"),
-    ("SpotLamp", "shadow_layer", "use_shadow_layer"),
-    ("SpotLamp", "sphere", "use_sphere"),
-    ("SunLamp", "only_shadow", "use_only_shadow"),
-    ("SunLamp", "shadow_layer", "use_shadow_layer"),
-    ("Material", "z_offset", "offset_z"),
-    ("Material", "shadow_casting_alpha", "shadow_cast_alpha"),
-    ("Material", "cast_approximate", "use_cast_approximate"),
-    ("Material", "cast_buffer_shadows", "use_cast_buffer_shadows"),
-    ("Material", "cast_shadows_only", "use_cast_shadows_only"),
-    ("Material", "face_texture", "use_face_texture"),
-    ("Material", "face_texture_alpha", "use_face_texture_alpha"),
-    ("Material", "full_oversampling", "use_full_oversampling"),
-    ("Material", "light_group_exclusive", "use_light_group_exclusive"),
-    ("Material", "object_color", "use_object_color"),
-    ("Material", "only_shadow", "use_only_shadow"),
-    ("Material", "ray_shadow_bias", "use_ray_shadow_bias"),
-    ("Material", "traceable", "use_raytrace"),
-    ("Material", "shadeless", "use_shadeless"),
-    ("Material", "tangent_shading", "use_tangent_shading"),
-    ("Material", "transparency", "use_transparency"),
-    ("Material", "receive_transparent_shadows", "use_transparent_shadows"),
-    ("Material", "vertex_color_light", "use_vertex_color_light"),
-    ("Material", "vertex_color_paint", "use_vertex_color_paint"),
-    ("Mesh", "autosmooth_angle", "auto_smooth_angle"),
-    ("Mesh", "autosmooth", "use_auto_smooth"),
-    ("Object", "max_draw_type", "draw_type"),
-    ("Object", "use_dupli_verts_rotation", "use_dupli_vertices_rotation"),
-    ("Object", "shape_key_edit_mode", "use_shape_key_edit_mode"),
-    ("Object", "slow_parent", "use_slow_parent"),
-    ("Object", "time_offset_add_parent", "use_time_offset_add_parent"),
-    ("Object", "time_offset_edit", "use_time_offset_edit"),
-    ("Object", "time_offset_parent", "use_time_offset_parent"),
-    ("Object", "time_offset_particle", "use_time_offset_particle"),
-    ("ParticleSettings", "adaptive_pix", "adaptive_pixel"),
-    ("ParticleSettings", "child_effector", "apply_effector_to_children"),
-    ("ParticleSettings", "child_guide", "apply_guide_to_children"),
-    ("ParticleSettings", "billboard_split_offset", "billboard_offset_split"),
-    ("ParticleSettings", "billboard_random_tilt", "billboard_tilt_random"),
-    ("ParticleSettings", "child_length_thres", "child_length_threshold"),
-    ("ParticleSettings", "child_random_size", "child_size_random"),
-    ("ParticleSettings", "clumppow", "clump_shape"),
-    ("ParticleSettings", "damp_factor", "damping"),
-    ("ParticleSettings", "draw_as", "draw_method"),
-    ("ParticleSettings", "random_factor", "factor_random"),
-    ("ParticleSettings", "grid_invert", "invert_grid"),
-    ("ParticleSettings", "random_length", "length_random"),
-    ("ParticleSettings", "random_lifetime", "lifetime_random"),
-    ("ParticleSettings", "billboard_lock", "lock_billboard"),
-    ("ParticleSettings", "boids_2d", "lock_boids_to_surface"),
-    ("ParticleSettings", "object_aligned_factor", "object_align_factor"),
-    ("ParticleSettings", "random_phase_factor", "phase_factor_random"),
-    ("ParticleSettings", "ren_as", "render_type"),
-    ("ParticleSettings", "rendered_child_nbr", "rendered_child_count"),
-    ("ParticleSettings", "random_rotation_factor", "rotation_factor_random"),
-    ("ParticleSettings", "rough1", "roughness_1"),
-    ("ParticleSettings", "rough1_size", "roughness_1_size"),
-    ("ParticleSettings", "rough2", "roughness_2"),
-    ("ParticleSettings", "rough2_size", "roughness_2_size"),
-    ("ParticleSettings", "rough2_thres", "roughness_2_threshold"),
-    ("ParticleSettings", "rough_end_shape", "roughness_end_shape"),
-    ("ParticleSettings", "rough_endpoint", "roughness_endpoint"),
-    ("ParticleSettings", "random_size", "size_random"),
-    ("ParticleSettings", "abs_path_time", "use_absolute_path_time"),
-    ("ParticleSettings", "animate_branching", "use_animate_branching"),
-    ("ParticleSettings", "branching", "use_branching"),
-    ("ParticleSettings", "died", "use_dead"),
-    ("ParticleSettings", "die_on_collision", "use_die_on_collision"),
-    ("ParticleSettings", "rotation_dynamic", "use_dynamic_rotation"),
-    ("ParticleSettings", "even_distribution", "use_even_distribution"),
-    ("ParticleSettings", "rand_group", "use_group_pick_random"),
-    ("ParticleSettings", "hair_bspline", "use_hair_bspline"),
-    ("ParticleSettings", "sizemass", "use_multiply_size_mass"),
-    ("ParticleSettings", "react_multiple", "use_react_multiple"),
-    ("ParticleSettings", "react_start_end", "use_react_start_end"),
-    ("ParticleSettings", "render_adaptive", "use_render_adaptive"),
-    ("ParticleSettings", "self_effect", "use_self_effect"),
-    ("ParticleSettings", "enable_simplify", "use_simplify"),
-    ("ParticleSettings", "size_deflect", "use_size_deflect"),
-    ("ParticleSettings", "render_strand", "use_strand_primitive"),
-    ("ParticleSettings", "symmetric_branching", "use_symmetric_branching"),
-    ("ParticleSettings", "velocity_length", "use_velocity_length"),
-    ("ParticleSettings", "whole_group", "use_whole_group"),
-    ("CloudsTexture", "noise_size", "noise_scale"),
-    ("DistortedNoiseTexture", "noise_size", "noise_scale"),
-    ("EnvironmentMapTexture", "filter_size_minimum", "use_filter_size_min"),
-    ("EnvironmentMapTexture", "mipmap_gauss", "use_mipmap_gauss"),
-    ("ImageTexture", "calculate_alpha", "use_calculate_alpha"),
-    ("ImageTexture", "checker_even", "use_checker_even"),
-    ("ImageTexture", "checker_odd", "use_checker_odd"),
-    ("ImageTexture", "filter_size_minimum", "use_filter_size_min"),
-    ("ImageTexture", "flip_axis", "use_flip_axis"),
-    ("ImageTexture", "mipmap_gauss", "use_mipmap_gauss"),
-    ("ImageTexture", "mirror_x", "use_mirror_x"),
-    ("ImageTexture", "mirror_y", "use_mirror_y"),
-    ("ImageTexture", "normal_map", "use_normal_map"),
-    ("MarbleTexture", "noise_size", "noise_scale"),
-    ("MarbleTexture", "noisebasis2", "noise_basis_2"),
-    ("MarbleTexture", "noisebasis_2", "noise_basis_2"),
-    ("MusgraveTexture", "highest_dimension", "dimension_max"),
-    ("MusgraveTexture", "noise_size", "noise_scale"),
-    ("StucciTexture", "noise_size", "noise_scale"),
-    ("VoronoiTexture", "coloring", "color_mode"),
-    ("VoronoiTexture", "noise_size", "noise_scale"),
-    ("WoodTexture", "noise_size", "noise_scale"),
-    ("WoodTexture", "noisebasis2", "noise_basis_2"),
-    ("WoodTexture", "noisebasis_2", "noise_basis_2"),
-    ("World", "blend_sky", "use_sky_blend"),
-    ("World", "paper_sky", "use_sky_paper"),
-    ("World", "real_sky", "use_sky_real"),
-    ("ImageUser", "auto_refresh", "use_auto_refresh"),
-    ("MaterialHalo", "flares_sub", "flare_subflare_count"),
-    ("MaterialHalo", "flare_subsize", "flare_subflare_size"),
-    ("MaterialHalo", "line_number", "line_count"),
-    ("MaterialHalo", "rings", "ring_count"),
-    ("MaterialHalo", "star_tips", "star_tip_count"),
-    ("MaterialHalo", "xalpha", "use_extreme_alpha"),
-    ("MaterialHalo", "flare_mode", "use_flare_mode"),
-    ("MaterialHalo", "vertex_normal", "use_vertex_normal"),
-    ("MaterialPhysics", "align_to_normal", "use_normal_align"),
-    ("MaterialStrand", "min_size", "size_min"),
-    ("MaterialStrand", "blender_units", "use_blender_units"),
-    ("MaterialStrand", "surface_diffuse", "use_surface_diffuse"),
-    ("MaterialStrand", "tangent_shading", "use_tangent_shading"),
-    ("MaterialSubsurfaceScattering", "error_tolerance", "error_threshold"),
-    ("MaterialVolume", "depth_cutoff", "depth_threshold"),
-    ("MaterialVolume", "lighting_mode", "light_method"),
-    ("MaterialVolume", "step_calculation", "step_method"),
-    ("MaterialVolume", "external_shadows", "use_external_shadows"),
-    ("MaterialVolume", "light_cache", "use_light_cache"),
-    ("ArmatureModifier", "multi_modifier", "use_multi_modifier"),
-    ("ArrayModifier", "constant_offset_displacement", "constant_offset_displace"),
-    ("ArrayModifier", "merge_distance", "merge_threshold"),
-    ("ArrayModifier", "relative_offset_displacement", "relative_offset_displace"),
-    ("ArrayModifier", "constant_offset", "use_constant_offset"),
-    ("ArrayModifier", "merge_adjacent_vertices", "use_merge_vertices"),
-    ("ArrayModifier", "merge_end_vertices", "use_merge_vertices_cap"),
-    ("ArrayModifier", "add_offset_object", "use_object_offset"),
-    ("ArrayModifier", "relative_offset", "use_relative_offset"),
-    ("BevelModifier", "only_vertices", "use_only_vertices"),
-    ("CastModifier", "from_radius", "use_radius_as_size"),
-    ("DisplaceModifier", "midlevel", "mid_level"),
-    ("DisplaceModifier", "texture_coordinates", "texture_coords"),
-    ("EdgeSplitModifier", "use_sharp", "use_edge_sharp"),
-    ("ExplodeModifier", "split_edges", "use_edge_split"),
-    ("MirrorModifier", "merge_limit", "merge_threshold"),
-    ("MirrorModifier", "mirror_u", "use_mirror_u"),
-    ("MirrorModifier", "mirror_v", "use_mirror_v"),
-    ("MirrorModifier", "mirror_vertex_groups", "use_mirror_vertex_groups"),
-    ("ParticleInstanceModifier", "particle_system_number", "particle_system_index"),
-    ("ParticleInstanceModifier", "keep_shape", "use_preserve_shape"),
-    ("ShrinkwrapModifier", "cull_back_faces", "use_cull_back_faces"),
-    ("ShrinkwrapModifier", "cull_front_faces", "use_cull_front_faces"),
-    ("ShrinkwrapModifier", "keep_above_surface", "use_keep_above_surface"),
-    ("SimpleDeformModifier", "lock_x_axis", "lock_x"),
-    ("SimpleDeformModifier", "lock_y_axis", "lock_y"),
-    ("SmokeModifier", "smoke_type", "type"),
-    ("SubsurfModifier", "subsurf_uv", "use_subsurf_uv"),
-    ("UVProjectModifier", "num_projectors", "projector_count"),
-    ("UVProjectModifier", "override_image", "use_image_override"),
-    ("WaveModifier", "texture_coordinates", "texture_coords"),
-    ("WaveModifier", "x_normal", "use_normal_x"),
-    ("WaveModifier", "y_normal", "use_normal_y"),
-    ("WaveModifier", "z_normal", "use_normal_z"),
-    ("NlaStrip", "blending", "blend_type"),
-    ("NlaStrip", "animated_influence", "use_animated_influence"),
-    ("NlaStrip", "animated_time", "use_animated_time"),
-    ("NlaStrip", "animated_time_cyclic", "use_animated_time_cyclic"),
-    ("NlaStrip", "auto_blending", "use_auto_blend"),
-    ("CompositorNodeAlphaOver", "convert_premul", "use_premultiply"),
-    ("CompositorNodeBlur", "sizex", "size_x"),
-    ("CompositorNodeBlur", "sizey", "size_y"),
-    ("CompositorNodeChannelMatte", "algorithm", "limit_method"),
-    ("CompositorNodeChromaMatte", "acceptance", "tolerance"),
-    ("CompositorNodeColorBalance", "correction_formula", "correction_method"),
-    ("CompositorNodeColorSpill", "algorithm", "limit_method"),
-    ("CompositorNodeColorSpill", "unspill", "use_unspill"),
-    ("CompositorNodeCrop", "x2", "max_x"),
-    ("CompositorNodeCrop", "y2", "max_y"),
-    ("CompositorNodeCrop", "x1", "min_x"),
-    ("CompositorNodeCrop", "y1", "min_y"),
-    ("CompositorNodeCrop", "crop_size", "use_crop_size"),
-    ("CompositorNodeDefocus", "max_blur", "blur_max"),
-    ("CompositorNodeDefocus", "gamma_correction", "use_gamma_correction"),
-    ("CompositorNodeGlare", "rotate_45", "use_rotate_45"),
-    ("CompositorNodeImage", "auto_refresh", "use_auto_refresh"),
-    ("CompositorNodeLensdist", "projector", "use_projector"),
-    ("CompositorNodeVecBlur", "max_speed", "speed_max"),
-    ("CompositorNodeVecBlur", "min_speed", "speed_min"),
-    ("ShaderNodeMapping", "maximum", "max"),
-    ("ShaderNodeMapping", "minimum", "min"),
-    ("ShaderNodeMapping", "clamp_maximum", "use_max"),
-    ("ShaderNodeMapping", "clamp_minimum", "use_min"),
-    ("VertexPaint", "all_faces", "use_all_faces"),
-    ("VertexPaint", "spray", "use_spray"),
-    ("ParticleEdit", "add_keys", "default_key_count"),
-    ("ParticleEdit", "selection_mode", "select_mode"),
-    ("ParticleEdit", "auto_velocity", "use_auto_velocity"),
-    ("ParticleEdit", "add_interpolate", "use_default_interpolate"),
-    ("ParticleEdit", "emitter_deflect", "use_emitter_deflect"),
-    ("ParticleEdit", "fade_time", "use_fade_time"),
-    ("ParticleEdit", "keep_lengths", "use_preserve_length"),
-    ("ParticleEdit", "keep_root", "use_preserve_root"),
-    ("ParticleSystem", "vertex_group_clump_negate", "invert_vertex_group_clump"),
-    ("ParticleSystem", "vertex_group_density_negate", "invert_vertex_group_density"),
-    ("ParticleSystem", "vertex_group_field_negate", "invert_vertex_group_field"),
-    ("ParticleSystem", "vertex_group_kink_negate", "invert_vertex_group_kink"),
-    ("ParticleSystem", "vertex_group_length_negate", "invert_vertex_group_length"),
-    ("ParticleSystem", "vertex_group_rotation_negate", "invert_vertex_group_rotation"),
-    ("ParticleSystem", "vertex_group_roughness1_negate", "invert_vertex_group_roughness_1"),
-    ("ParticleSystem", "vertex_group_roughness2_negate", "invert_vertex_group_roughness_2"),
-    ("ParticleSystem", "vertex_group_roughness_end_negate", "invert_vertex_group_roughness_end"),
-    ("ParticleSystem", "vertex_group_size_negate", "invert_vertex_group_size"),
-    ("ParticleSystem", "vertex_group_tangent_negate", "invert_vertex_group_tangent"),
-    ("ParticleSystem", "vertex_group_velocity_negate", "invert_vertex_group_velocity"),
-    ("ParticleSystem", "hair_dynamics", "use_hair_dynamics"),
-    ("ParticleSystem", "keyed_timing", "use_keyed_timing"),
-    ("PointDensity", "falloff_softness", "falloff_soft"),
-    ("PointDensity", "particle_cache", "particle_cache_space"),
-    ("PointDensity", "turbulence_size", "turbulence_scale"),
-    ("PointDensity", "turbulence", "use_turbulence"),
-    ("PointDensity", "vertices_cache", "vertex_cache_space"),
-    ("PoseBone", "ik_lin_weight", "ik_linear_weight"),
-    ("PoseBone", "ik_rot_weight", "ik_rotation_weight"),
-    ("PoseBone", "ik_limit_x", "use_ik_limit_x"),
-    ("PoseBone", "ik_limit_y", "use_ik_limit_y"),
-    ("PoseBone", "ik_limit_z", "use_ik_limit_z"),
-    ("PoseBone", "ik_lin_control", "use_ik_linear_control"),
-    ("PoseBone", "ik_rot_control", "use_ik_rotation_control"),
-    ("Bone", "use_hinge", "use_inherit_rotation"),
-    ("SPHFluidSettings", "spring_k", "spring_force"),
-    ("SPHFluidSettings", "stiffness_k", "stiffness"),
-    ("SPHFluidSettings", "stiffness_knear", "stiffness_near"),
-    ("SceneGameData", "framing_color", "frame_color"),
-    ("SceneGameData", "framing_type", "frame_type"),
-    ("SceneGameData", "eye_separation", "stereo_eye_separation"),
-    ("SceneGameData", "activity_culling", "use_activity_culling"),
-    ("SceneGameData", "auto_start", "use_auto_start"),
-    ("SceneGameData", "glsl_extra_textures", "use_glsl_extra_textures"),
-    ("SceneGameData", "glsl_lights", "use_glsl_lights"),
-    ("SceneGameData", "glsl_nodes", "use_glsl_nodes"),
-    ("SceneGameData", "glsl_ramps", "use_glsl_ramps"),
-    ("SceneGameData", "glsl_shaders", "use_glsl_shaders"),
-    ("SceneGameData", "glsl_shadows", "use_glsl_shadows"),
-    ("Sequence", "blend_opacity", "blend_alpha"),
-    ("Sequence", "blend_mode", "blend_type"),
-    ("Sequence", "frame_final_length", "frame_final_duration"),
-    ("Sequence", "use_effect_default_fade", "use_default_fade"),
-    ("SequenceColorBalance", "inverse_gain", "invert_gain"),
-    ("SequenceColorBalance", "inverse_gamma", "invert_gamma"),
-    ("SequenceColorBalance", "inverse_lift", "invert_lift"),
-    ("EffectSequence", "multiply_colors", "color_multiply"),
-    ("EffectSequence", "de_interlace", "use_deinterlace"),
-    ("EffectSequence", "flip_x", "use_flip_x"),
-    ("EffectSequence", "flip_y", "use_flip_y"),
-    ("EffectSequence", "convert_float", "use_float"),
-    ("EffectSequence", "premultiply", "use_premultiply"),
-    ("EffectSequence", "proxy_custom_directory", "use_proxy_custom_directory"),
-    ("EffectSequence", "proxy_custom_file", "use_proxy_custom_file"),
-    ("EffectSequence", "reverse_frames", "use_reverse_frames"),
-    ("GlowSequence", "blur_distance", "blur_radius"),
-    ("GlowSequence", "only_boost", "use_only_boost"),
-    ("SpeedControlSequence", "curve_compress_y", "use_curve_compress_y"),
-    ("SpeedControlSequence", "curve_velocity", "use_curve_velocity"),
-    ("SpeedControlSequence", "frame_blending", "use_frame_blend"),
-    ("TransformSequence", "uniform_scale", "use_uniform_scale"),
-    ("ImageSequence", "animation_end_offset", "animation_offset_end"),
-    ("ImageSequence", "animation_start_offset", "animation_offset_start"),
-    ("ImageSequence", "multiply_colors", "color_multiply"),
-    ("ImageSequence", "de_interlace", "use_deinterlace"),
-    ("ImageSequence", "flip_x", "use_flip_x"),
-    ("ImageSequence", "flip_y", "use_flip_y"),
-    ("ImageSequence", "convert_float", "use_float"),
-    ("ImageSequence", "premultiply", "use_premultiply"),
-    ("ImageSequence", "proxy_custom_directory", "use_proxy_custom_directory"),
-    ("ImageSequence", "proxy_custom_file", "use_proxy_custom_file"),
-    ("ImageSequence", "reverse_frames", "use_reverse_frames"),
-    ("MetaSequence", "animation_end_offset", "animation_offset_end"),
-    ("MetaSequence", "animation_start_offset", "animation_offset_start"),
-    ("MetaSequence", "multiply_colors", "color_multiply"),
-    ("MetaSequence", "de_interlace", "use_deinterlace"),
-    ("MetaSequence", "flip_x", "use_flip_x"),
-    ("MetaSequence", "flip_y", "use_flip_y"),
-    ("MetaSequence", "convert_float", "use_float"),
-    ("MetaSequence", "premultiply", "use_premultiply"),
-    ("MetaSequence", "proxy_custom_directory", "use_proxy_custom_directory"),
-    ("MetaSequence", "proxy_custom_file", "use_proxy_custom_file"),
-    ("MetaSequence", "reverse_frames", "use_reverse_frames"),
-    ("MovieSequence", "animation_end_offset", "animation_offset_end"),
-    ("MovieSequence", "animation_start_offset", "animation_offset_start"),
-    ("MovieSequence", "multiply_colors", "color_multiply"),
-    ("MovieSequence", "de_interlace", "use_deinterlace"),
-    ("MovieSequence", "flip_x", "use_flip_x"),
-    ("MovieSequence", "flip_y", "use_flip_y"),
-    ("MovieSequence", "convert_float", "use_float"),
-    ("MovieSequence", "premultiply", "use_premultiply"),
-    ("MovieSequence", "proxy_custom_directory", "use_proxy_custom_directory"),
-    ("MovieSequence", "proxy_custom_file", "use_proxy_custom_file"),
-    ("MovieSequence", "reverse_frames", "use_reverse_frames"),
-    ("MulticamSequence", "animation_end_offset", "animation_offset_end"),
-    ("MulticamSequence", "animation_start_offset", "animation_offset_start"),
-    ("MulticamSequence", "multiply_colors", "color_multiply"),
-    ("MulticamSequence", "de_interlace", "use_deinterlace"),
-    ("MulticamSequence", "flip_x", "use_flip_x"),
-    ("MulticamSequence", "flip_y", "use_flip_y"),
-    ("MulticamSequence", "convert_float", "use_float"),
-    ("MulticamSequence", "premultiply", "use_premultiply"),
-    ("MulticamSequence", "proxy_custom_directory", "use_proxy_custom_directory"),
-    ("MulticamSequence", "proxy_custom_file", "use_proxy_custom_file"),
-    ("MulticamSequence", "reverse_frames", "use_reverse_frames"),
-    ("SceneSequence", "animation_end_offset", "animation_offset_end"),
-    ("SceneSequence", "animation_start_offset", "animation_offset_start"),
-    ("SceneSequence", "multiply_colors", "color_multiply"),
-    ("SceneSequence", "de_interlace", "use_deinterlace"),
-    ("SceneSequence", "flip_x", "use_flip_x"),
-    ("SceneSequence", "flip_y", "use_flip_y"),
-    ("SceneSequence", "convert_float", "use_float"),
-    ("SceneSequence", "premultiply", "use_premultiply"),
-    ("SceneSequence", "proxy_custom_directory", "use_proxy_custom_directory"),
-    ("SceneSequence", "proxy_custom_file", "use_proxy_custom_file"),
-    ("SceneSequence", "reverse_frames", "use_reverse_frames"),
-    ("SoundSequence", "animation_end_offset", "animation_offset_end"),
-    ("SoundSequence", "animation_start_offset", "animation_offset_start"),
-    ("SmokeDomainSettings", "smoke_domain_colli", "collision_extents"),
-    ("SmokeDomainSettings", "smoke_cache_high_comp", "point_cache_compress_high_type"),
-    ("SmokeDomainSettings", "smoke_cache_comp", "point_cache_compress_type"),
-    ("SmokeDomainSettings", "maxres", "resolution_max"),
-    ("SmokeDomainSettings", "smoothemitter", "smooth_emitter"),
-    ("SmokeDomainSettings", "dissolve_smoke", "use_dissolve_smoke"),
-    ("SmokeDomainSettings", "dissolve_smoke_log", "use_dissolve_smoke_log"),
-    ("SmokeDomainSettings", "highres", "use_high_resolution"),
-    ("SoftBodySettings", "bending", "bend"),
-    ("SoftBodySettings", "error_limit", "error_threshold"),
-    ("SoftBodySettings", "lcom", "location_mass_center"),
-    ("SoftBodySettings", "lrot", "rotation_estimate"),
-    ("SoftBodySettings", "lscale", "scale_estimate"),
-    ("SoftBodySettings", "maxstep", "step_max"),
-    ("SoftBodySettings", "minstep", "step_min"),
-    ("SoftBodySettings", "diagnose", "use_diagnose"),
-    ("SoftBodySettings", "edge_collision", "use_edge_collision"),
-    ("SoftBodySettings", "estimate_matrix", "use_estimate_matrix"),
-    ("SoftBodySettings", "face_collision", "use_face_collision"),
-    ("SoftBodySettings", "self_collision", "use_self_collision"),
-    ("SoftBodySettings", "stiff_quads", "use_stiff_quads"),
-    ("TexMapping", "maximum", "max"),
-    ("TexMapping", "minimum", "min"),
-    ("TexMapping", "has_maximum", "use_max"),
-    ("TexMapping", "has_minimum", "use_min"),
-    ("TextCharacterFormat", "bold", "use_bold"),
-    ("TextCharacterFormat", "italic", "use_italic"),
-    ("TextCharacterFormat", "underline", "use_underline"),
-    ("TextureSlot", "rgb_to_intensity", "use_rgb_to_intensity"),
-    ("TextureSlot", "stencil", "use_stencil"),
-    ("LampTextureSlot", "texture_coordinates", "texture_coords"),
-    ("LampTextureSlot", "map_color", "use_map_color"),
-    ("LampTextureSlot", "map_shadow", "use_map_shadow"),
-    ("MaterialTextureSlot", "coloremission_factor", "color_emission_factor"),
-    ("MaterialTextureSlot", "colordiff_factor", "diffuse_color_factor"),
-    ("MaterialTextureSlot", "x_mapping", "mapping_x"),
-    ("MaterialTextureSlot", "y_mapping", "mapping_y"),
-    ("MaterialTextureSlot", "z_mapping", "mapping_z"),
-    ("MaterialTextureSlot", "colorreflection_factor", "reflection_color_factor"),
-    ("MaterialTextureSlot", "colorspec_factor", "specular_color_factor"),
-    ("MaterialTextureSlot", "texture_coordinates", "texture_coords"),
-    ("MaterialTextureSlot", "colortransmission_factor", "transmission_color_factor"),
-    ("MaterialTextureSlot", "from_dupli", "use_from_dupli"),
-    ("MaterialTextureSlot", "from_original", "use_from_original"),
-    ("MaterialTextureSlot", "map_alpha", "use_map_alpha"),
-    ("MaterialTextureSlot", "map_ambient", "use_map_ambient"),
-    ("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"),
-    ("MaterialTextureSlot", "map_colortransmission", "use_map_color_transmission"),
-    ("MaterialTextureSlot", "map_density", "use_map_density"),
-    ("MaterialTextureSlot", "map_diffuse", "use_map_diffuse"),
-    ("MaterialTextureSlot", "map_displacement", "use_map_displacement"),
-    ("MaterialTextureSlot", "map_emission", "use_map_emission"),
-    ("MaterialTextureSlot", "map_emit", "use_map_emit"),
-    ("MaterialTextureSlot", "map_hardness", "use_map_hardness"),
-    ("MaterialTextureSlot", "map_mirror", "use_map_mirror"),
-    ("MaterialTextureSlot", "map_normal", "use_map_normal"),
-    ("MaterialTextureSlot", "map_raymir", "use_map_raymir"),
-    ("MaterialTextureSlot", "map_reflection", "use_map_reflect"),
-    ("MaterialTextureSlot", "map_scattering", "use_map_scatter"),
-    ("MaterialTextureSlot", "map_specular", "use_map_specular"),
-    ("MaterialTextureSlot", "map_translucency", "use_map_translucency"),
-    ("MaterialTextureSlot", "map_warp", "use_map_warp"),
-    ("WorldTextureSlot", "texture_coordinates", "texture_coords"),
-    ("WorldTextureSlot", "map_blend", "use_map_blend"),
-    ("WorldTextureSlot", "map_horizon", "use_map_horizon"),
-    ("WorldTextureSlot", "map_zenith_down", "use_map_zenith_down"),
-    ("WorldTextureSlot", "map_zenith_up", "use_map_zenith_up"),
-    ("VoxelData", "still_frame_number", "still_frame"),
-    ("WorldLighting", "ao_blend_mode", "ao_blend_type"),
-    ("WorldLighting", "error_tolerance", "error_threshold"),
-    ("WorldLighting", "use_ambient_occlusion", "use_ambient_occlusian"),
-    ("WorldLighting", "pixel_cache", "use_cache"),
-    ("WorldLighting", "use_environment_lighting", "use_environment_light"),
-    ("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"),
-    ("SoftBodySettings", "damp", "damping"),
-    ("SequenceCrop", "right", "max_x"),
-    ("SequenceCrop", "top", "max_y"),
-    ("SequenceCrop", "bottom", "min_x"),
-    ("SequenceCrop", "left", "min_y"),
-    ("Sequence", "speed_fader", "speed_factor"),
-    ("SpeedControlSequence", "global_speed", "multiply_speed"),
-    ("SpeedControlSequence", "use_curve_velocity", "use_as_speed"),
-    ("SpeedControlSequence", "use_curve_compress_y", "scale_to_length"),
-    ("Key", "keys", "key_blocks"),
-    ]
-
-
-from bpy.types import Operator
-
-
-class UpdateAnimData(Operator):
-    """Update data paths from 2.56 and previous versions, modifying data paths of drivers and fcurves"""
-    bl_idname = "anim.update_data_paths"
-    bl_label = "Update Animation Data"
-
-    def execute(self, context):
-        import animsys_refactor
-        animsys_refactor.update_data_paths(data_path_update)
-        return {'FINISHED'}
index 9b037f7dc096c11f32babcfbd4ffc387a3abc5b7..fd2b14658ad94d8cf7e31c7729b5efd39d818c22 100644 (file)
@@ -26,9 +26,6 @@ from bpy.props import (StringProperty,
                        FloatProperty,
                        EnumProperty,
                        )
-                       
-import addon_utils
-import os
 
 from rna_prop_ui import rna_idprop_ui_prop_get, rna_idprop_ui_prop_clear
 
@@ -758,6 +755,7 @@ class WM_OT_path_open(Operator):
 
     def execute(self, context):
         import sys
+        import os
         import subprocess
 
         filepath = bpy.path.abspath(self.filepath)
@@ -1102,6 +1100,7 @@ class WM_OT_appconfig_default(Operator):
     bl_label = "Default Application Configuration"
 
     def execute(self, context):
+        import os
 
         context.window_manager.keyconfigs.active = context.window_manager.keyconfigs.default
 
@@ -1123,6 +1122,7 @@ class WM_OT_appconfig_activate(Operator):
             )
 
     def execute(self, context):
+        import os
         bpy.utils.keyconfig_set(self.filepath)
 
         filepath = self.filepath.replace("keyconfig", "interaction")
@@ -1150,6 +1150,7 @@ class WM_OT_copy_prev_settings(Operator):
     bl_label = "Copy Previous Settings"
 
     def execute(self, context):
+        import os
         import shutil
         ver = bpy.app.version
         ver_old = ((ver[0] * 100) + ver[1]) - 1
@@ -1608,6 +1609,8 @@ class WM_OT_addon_enable(Operator):
             )
 
     def execute(self, context):
+        import addon_utils
+
         mod = addon_utils.enable(self.module)
 
         if mod:
@@ -1637,6 +1640,8 @@ class WM_OT_addon_disable(Operator):
             )
 
     def execute(self, context):
+        import addon_utils
+
         addon_utils.disable(self.module)
         return {'FINISHED'}
 
@@ -1690,6 +1695,7 @@ class WM_OT_addon_install(Operator):
                     os.remove(f_full)
 
     def execute(self, context):
+        import addon_utils
         import traceback
         import zipfile
         import shutil
@@ -1725,7 +1731,7 @@ class WM_OT_addon_install(Operator):
         del pyfile_dir
         # done checking for exceptional case
 
-        addons_old = {mod.__name__ for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules)}
+        addons_old = {mod.__name__ for mod in addon_utils.modules(addon_utils.addons_fake_modules)}
 
         #check to see if the file is in compressed format (.zip)
         if zipfile.is_zipfile(pyfile):
@@ -1774,7 +1780,7 @@ class WM_OT_addon_install(Operator):
                 traceback.print_exc()
                 return {'CANCELLED'}
 
-        addons_new = {mod.__name__ for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules)} - addons_old
+        addons_new = {mod.__name__ for mod in addon_utils.modules(addon_utils.addons_fake_modules)} - addons_old
         addons_new.discard("modules")
 
         # disable any addons we may have enabled previously and removed.
@@ -1784,7 +1790,7 @@ class WM_OT_addon_install(Operator):
 
         # possible the zip contains multiple addons, we could disallow this
         # but for now just use the first
-        for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules):
+        for mod in addon_utils.modules(addon_utils.addons_fake_modules):
             if mod.__name__ in addons_new:
                 info = addon_utils.module_bl_info(mod)
 
@@ -1818,7 +1824,9 @@ class WM_OT_addon_remove(Operator):
 
     @staticmethod
     def path_from_addon(module):
-        for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules):
+        import addon_utils
+
+        for mod in addon_utils.modules(addon_utils.addons_fake_modules):
             if mod.__name__ == module:
                 filepath = mod.__file__
                 if os.path.exists(filepath):
@@ -1829,6 +1837,8 @@ class WM_OT_addon_remove(Operator):
         return None, False
 
     def execute(self, context):
+        import addon_utils
+
         path, isdir = WM_OT_addon_remove.path_from_addon(self.module)
         if path is None:
             self.report('WARNING', "Addon path %r could not be found" % path)
@@ -1868,12 +1878,14 @@ class WM_OT_addon_expand(Operator):
             )
 
     def execute(self, context):
+        import addon_utils
+
         module_name = self.module
 
         # unlikely to fail, module should have already been imported
         try:
             # mod = __import__(module_name)
-            mod = USERPREF_PT_addons.module_get(module_name)
+            mod = addon_utils.addons_fake_modules.get(module_name)
         except:
             import traceback
             traceback.print_exc()
index c8da7e15031c5d8071aedfe92bf78d80f7d11d72..0f5fd8eecb16a78a614b9c6fd14c58104881fe0f 100644 (file)
@@ -97,7 +97,7 @@ def register():
 
         items_unique = set()
 
-        for mod in addon_utils.modules(space_userpref.USERPREF_PT_addons._addons_fake_modules):
+        for mod in addon_utils.modules(addon_utils.addons_fake_modules):
             info = addon_utils.module_bl_info(mod)
             items_unique.add(info["category"])
 
index 9e55c8ad8154a4ea58bc1c247282588426fece55..5670b912c7b442fef245aa28765baa4278f99015 100644 (file)
@@ -891,17 +891,11 @@ class USERPREF_PT_addons(Panel):
     bl_region_type = 'WINDOW'
     bl_options = {'HIDE_HEADER'}
 
-    _addons_fake_modules = {}
-
     @classmethod
     def poll(cls, context):
         userpref = context.user_preferences
         return (userpref.active_section == 'ADDONS')
 
-    @staticmethod
-    def module_get(mod_name):
-        return USERPREF_PT_addons._addons_fake_modules[mod_name]
-
     @staticmethod
     def is_user_addon(mod, user_addon_paths):
         if not user_addon_paths:
@@ -932,7 +926,7 @@ class USERPREF_PT_addons(Panel):
         used_ext = {ext.module for ext in userpref.addons}
 
         # collect the categories that can be filtered on
-        addons = [(mod, addon_utils.module_bl_info(mod)) for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules)]
+        addons = [(mod, addon_utils.module_bl_info(mod)) for mod in addon_utils.modules(addon_utils.addons_fake_modules)]
 
         split = layout.split(percentage=0.2)
         col = split.column()
index 6e17b056685e9d5cc789040f90f0204862b4a64b..2c3ffc296ba8512d1900c4e0b9c87ec197738add 100644 (file)
@@ -257,7 +257,7 @@ struct DerivedMesh {
         */
        void (*drawFacesTex)(DerivedMesh *dm,
                                                 int (*setDrawOptions)(struct MTFace *tface,
-                                                struct MCol *mcol, int matnr));
+                                                int has_mcol, int matnr));
 
        /* Draw all faces with GLSL materials
         *  o setMaterial is called for every different material nr
index fddd2809c47735d06a0fd94798b115f38d32b394..5e462238f31851150261de692824bfdb8b4d0741 100644 (file)
@@ -799,7 +799,7 @@ static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us
 }
 
 static void emDM_drawFacesTex_common(DerivedMesh *dm,
-                          int (*drawParams)(MTFace *tface, MCol *mcol, int matnr),
+                          int (*drawParams)(MTFace *tface, int has_mcol, int matnr),
                           int (*drawParamsMapped)(void *userData, int index),
                           void *userData) 
 {
@@ -827,7 +827,7 @@ static void emDM_drawFacesTex_common(DerivedMesh *dm,
                        int flag;
 
                        if(drawParams)
-                               flag= drawParams(tf, mcol, efa->mat_nr);
+                               flag= drawParams(tf, (mcol != NULL), efa->mat_nr);
                        else if(drawParamsMapped)
                                flag= drawParamsMapped(userData, i);
                        else
@@ -900,7 +900,7 @@ static void emDM_drawFacesTex_common(DerivedMesh *dm,
                        int flag;
 
                        if(drawParams)
-                               flag= drawParams(tf, mcol, efa->mat_nr);
+                               flag= drawParams(tf, (mcol != NULL), efa->mat_nr);
                        else if(drawParamsMapped)
                                flag= drawParamsMapped(userData, i);
                        else
@@ -966,7 +966,7 @@ static void emDM_drawFacesTex_common(DerivedMesh *dm,
        }
 }
 
-static void emDM_drawFacesTex(DerivedMesh *dm, int (*setDrawOptions)(MTFace *tface, MCol *mcol, int matnr))
+static void emDM_drawFacesTex(DerivedMesh *dm, int (*setDrawOptions)(MTFace *tface, int has_mcol, int matnr))
 {
        emDM_drawFacesTex_common(dm, setDrawOptions, NULL, NULL);
 }
index afa310b0b801dd3212a3c2cdebc2aa5e550c02d9..707bf95f9c3d494b721282ec4b2297fc349fc0d6 100644 (file)
@@ -647,7 +647,7 @@ static void cdDM_drawFacesColored(DerivedMesh *dm, int useTwoSided, unsigned cha
 }
 
 static void cdDM_drawFacesTex_common(DerivedMesh *dm,
-                          int (*drawParams)(MTFace *tface, MCol *mcol, int matnr),
+                          int (*drawParams)(MTFace *tface, int has_mcol, int matnr),
                           int (*drawParamsMapped)(void *userData, int index),
                           void *userData) 
 {
@@ -673,7 +673,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
                        unsigned char *cp = NULL;
 
                        if(drawParams) {
-                               flag = drawParams(tf? &tf[i]: NULL, mcol? &mcol[i*4]: NULL, mf->mat_nr);
+                               flag = drawParams(tf? &tf[i]: NULL, (mcol != NULL), mf->mat_nr);
                        }
                        else {
                                if(index) {
@@ -792,7 +792,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
                                int flag = 1;
 
                                if(drawParams) {
-                                       flag = drawParams(tf? &tf[actualFace]: NULL, mcol? &mcol[actualFace*4]: NULL, mf[actualFace].mat_nr);
+                                       flag = drawParams(tf? &tf[actualFace]: NULL, (mcol != NULL), mf[actualFace].mat_nr);
                                }
                                else {
                                        if(index) {
@@ -835,7 +835,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
        }
 }
 
-static void cdDM_drawFacesTex(DerivedMesh *dm, int (*setDrawOptions)(MTFace *tface, MCol *mcol, int matnr))
+static void cdDM_drawFacesTex(DerivedMesh *dm, int (*setDrawOptions)(MTFace *tface, int has_mcol, int matnr))
 {
        cdDM_drawFacesTex_common(dm, setDrawOptions, NULL, NULL);
 }
index 3626374622838b4965d047adce8ce3e51fe692fb..3d3806f7c022acabd86b0f7d01dbeedaae4dee65 100644 (file)
@@ -1583,7 +1583,7 @@ static void ccgDM_drawFacesColored(DerivedMesh *dm, int UNUSED(useTwoSided), uns
 }
 
 static void ccgDM_drawFacesTex_common(DerivedMesh *dm,
-       int (*drawParams)(MTFace *tface, MCol *mcol, int matnr),
+       int (*drawParams)(MTFace *tface, int has_mcol, int matnr),
        int (*drawParamsMapped)(void *userData, int index),
        void *userData) 
 {
@@ -1619,7 +1619,7 @@ static void ccgDM_drawFacesTex_common(DerivedMesh *dm,
                }
 
                if(drawParams)
-                       flag = drawParams(tf, mcol, mat_nr);
+                       flag = drawParams(tf, (mcol != NULL), mat_nr);
                else if (index != ORIGINDEX_NONE)
                        flag= (drawParamsMapped)? drawParamsMapped(userData, index): 1;
                else
@@ -1722,7 +1722,7 @@ static void ccgDM_drawFacesTex_common(DerivedMesh *dm,
        }
 }
 
-static void ccgDM_drawFacesTex(DerivedMesh *dm, int (*setDrawOptions)(MTFace *tface, MCol *mcol, int matnr))
+static void ccgDM_drawFacesTex(DerivedMesh *dm, int (*setDrawOptions)(MTFace *tface, int has_mcol, int matnr))
 {
        ccgDM_drawFacesTex_common(dm, setDrawOptions, NULL, NULL);
 }
index 0c819cd76495082036a1e56e1fd758a404d6fd0e..98cca08fd7a162b8f93d2bf3da4af3dc1b394d1e 100644 (file)
@@ -1472,6 +1472,8 @@ static int add_primitive_circle_exec(bContext *C, wmOperator *op)
 
 void MESH_OT_primitive_circle_add(wmOperatorType *ot)
 {
+       PropertyRNA *prop;
+
        /* identifiers */
        ot->name= "Add Circle";
        ot->description= "Construct a circle mesh";
@@ -1487,7 +1489,8 @@ void MESH_OT_primitive_circle_add(wmOperatorType *ot)
        
        /* props */
        RNA_def_int(ot->srna, "vertices", 32, 3, INT_MAX, "Vertices", "", 3, 500);
-       RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00);
+       prop = RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00);
+       RNA_def_property_subtype(prop, PROP_DISTANCE);
        RNA_def_boolean(ot->srna, "fill", 0, "Fill", "");
 
        ED_object_add_generic_props(ot, TRUE);
@@ -1513,6 +1516,8 @@ static int add_primitive_cylinder_exec(bContext *C, wmOperator *op)
 
 void MESH_OT_primitive_cylinder_add(wmOperatorType *ot)
 {
+       PropertyRNA *prop;
+
        /* identifiers */
        ot->name= "Add Cylinder";
        ot->description= "Construct a cylinder mesh";
@@ -1528,8 +1533,10 @@ void MESH_OT_primitive_cylinder_add(wmOperatorType *ot)
        
        /* props */
        RNA_def_int(ot->srna, "vertices", 32, 2, INT_MAX, "Vertices", "", 2, 500);
-       RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00);
-       RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
+       prop = RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00);
+       RNA_def_property_subtype(prop, PROP_DISTANCE);
+       prop = RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
+       RNA_def_property_subtype(prop, PROP_DISTANCE);
        RNA_def_boolean(ot->srna, "cap_ends", 1, "Cap Ends", "");
 
        ED_object_add_generic_props(ot, TRUE);
@@ -1554,6 +1561,8 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op)
 
 void MESH_OT_primitive_cone_add(wmOperatorType *ot)
 {
+       PropertyRNA *prop;
+
        /* identifiers */
        ot->name= "Add Cone";
        ot->description= "Construct a conic mesh (ends filled)";
@@ -1569,8 +1578,10 @@ void MESH_OT_primitive_cone_add(wmOperatorType *ot)
        
        /* props */
        RNA_def_int(ot->srna, "vertices", 32, 2, INT_MAX, "Vertices", "", 2, 500);
-       RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00);
-       RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
+       prop = RNA_def_float(ot->srna, "radius", 1.0f, 0.0, FLT_MAX, "Radius", "", 0.001, 100.00);
+       RNA_def_property_subtype(prop, PROP_DISTANCE);
+       prop = RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
+       RNA_def_property_subtype(prop, PROP_DISTANCE);
        RNA_def_boolean(ot->srna, "cap_end", 1, "Cap End", "");
 
        ED_object_add_generic_props(ot, TRUE);
@@ -1595,6 +1606,8 @@ static int add_primitive_grid_exec(bContext *C, wmOperator *op)
 
 void MESH_OT_primitive_grid_add(wmOperatorType *ot)
 {
+       PropertyRNA *prop;
+
        /* identifiers */
        ot->name= "Add Grid";
        ot->description= "Construct a grid mesh";
@@ -1611,7 +1624,8 @@ void MESH_OT_primitive_grid_add(wmOperatorType *ot)
        /* props */
        RNA_def_int(ot->srna, "x_subdivisions", 10, 3, INT_MAX, "X Subdivisions", "", 3, 1000);
        RNA_def_int(ot->srna, "y_subdivisions", 10, 3, INT_MAX, "Y Subdivisions", "", 3, 1000);
-       RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, FLT_MAX);
+       prop = RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, FLT_MAX);
+       RNA_def_property_subtype(prop, PROP_DISTANCE);
 
        ED_object_add_generic_props(ot, TRUE);
 }
@@ -1668,6 +1682,8 @@ static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op)
 
 void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot)
 {
+       PropertyRNA *prop;
+
        /* identifiers */
        ot->name= "Add UV Sphere";
        ot->description= "Construct a UV sphere mesh";
@@ -1684,7 +1700,8 @@ void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot)
        /* props */
        RNA_def_int(ot->srna, "segments", 32, 3, INT_MAX, "Segments", "", 3, 500);
        RNA_def_int(ot->srna, "ring_count", 16, 3, INT_MAX, "Rings", "", 3, 500);
-       RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, 100.00);
+       prop = RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, 100.00);
+       RNA_def_property_subtype(prop, PROP_DISTANCE);
 
        ED_object_add_generic_props(ot, TRUE);
 }
@@ -1707,6 +1724,8 @@ static int add_primitive_icosphere_exec(bContext *C, wmOperator *op)
 
 void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot)
 {
+       PropertyRNA *prop;
+
        /* identifiers */
        ot->name= "Add Ico Sphere";
        ot->description= "Construct an Icosphere mesh";
@@ -1722,7 +1741,8 @@ void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot)
        
        /* props */
        RNA_def_int(ot->srna, "subdivisions", 2, 1, INT_MAX, "Subdivisions", "", 1, 8);
-       RNA_def_float(ot->srna, "size", 1.0f, 0.0f, FLT_MAX, "Size", "", 0.001f, 100.00);
+       prop = RNA_def_float(ot->srna, "size", 1.0f, 0.0f, FLT_MAX, "Size", "", 0.001f, 100.00);
+       RNA_def_property_subtype(prop, PROP_DISTANCE);
 
        ED_object_add_generic_props(ot, TRUE);
 }
index b6e76885719b0a95475159189044b205d1a3d8f5..bf4bd7f1d93fe5dccc4b3128e54565feed22cf24 100644 (file)
@@ -362,7 +362,7 @@ static void draw_textured_end(void)
        glPopMatrix();
 }
 
-static int draw_tface__set_draw_legacy(MTFace *tface, MCol *mcol, int matnr)
+static int draw_tface__set_draw_legacy(MTFace *tface, int has_mcol, int matnr)
 {
        Material *ma= give_current_material(Gtexdraw.ob, matnr+1);
        int validtexture=0;
@@ -377,7 +377,7 @@ static int draw_tface__set_draw_legacy(MTFace *tface, MCol *mcol, int matnr)
        } else if (ma && ma->shade_flag&MA_OBCOLOR) {
                glColor3ubv(Gtexdraw.obcol);
                return 2; /* Don't set color */
-       } else if (!mcol) {
+       } else if (!has_mcol) {
                if (tface) glColor3f(1.0, 1.0, 1.0);
                else {
                        if(ma) {
@@ -394,7 +394,7 @@ static int draw_tface__set_draw_legacy(MTFace *tface, MCol *mcol, int matnr)
                return 1; /* Set color from mcol */
        }
 }
-static int draw_tface__set_draw(MTFace *tface, MCol *mcol, int matnr)
+static int draw_tface__set_draw(MTFace *tface, int has_mcol, int matnr)
 {
        Material *ma= give_current_material(Gtexdraw.ob, matnr+1);
 
@@ -404,7 +404,7 @@ static int draw_tface__set_draw(MTFace *tface, MCol *mcol, int matnr)
                return 2; /* Don't set color */
        } else if (tface && tface->mode&TF_OBCOL) {
                return 2; /* Don't set color */
-       } else if (!mcol) {
+       } else if (!has_mcol) {
                return 1; /* Don't set color */
        } else {
                return 1; /* Set color from mcol */
@@ -491,28 +491,26 @@ static int draw_tface_mapped__set_draw(void *userData, int index)
        Mesh *me = (Mesh*)userData;
        MTFace *tface = (me->mtface)? &me->mtface[index]: NULL;
        MFace *mface = &me->mface[index];
-       MCol *mcol = (me->mcol)? &me->mcol[index]: NULL;
        const int matnr = mface->mat_nr;
        if (mface->flag & ME_HIDE) return 0;
-       return draw_tface__set_draw(tface, mcol, matnr);
+       return draw_tface__set_draw(tface, (me->mcol != NULL), matnr);
 }
 
 static int draw_em_tf_mapped__set_draw(void *userData, int index)
 {
-       EditMesh *em = userData;
+       struct {EditMesh *em; short has_mcol; short has_mtface;} *data = userData;
+       EditMesh *em = data->em;
        EditFace *efa= EM_get_face_for_index(index);
        MTFace *tface;
-       MCol *mcol;
        int matnr;
 
        if (efa->h)
                return 0;
 
-       tface = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
-       mcol = CustomData_em_get(&em->fdata, efa->data, CD_MCOL);
+       tface = data->has_mtface ? CustomData_em_get(&em->fdata, efa->data, CD_MTFACE) : NULL;
        matnr = efa->mat_nr;
 
-       return draw_tface__set_draw_legacy(tface, mcol, matnr);
+       return draw_tface__set_draw_legacy(tface, data->has_mcol, matnr);
 }
 
 static int wpaint__setSolidDrawOptions(void *userData, int index, int *drawSmooth_r)
@@ -632,7 +630,13 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *o
        glColor4f(1.0f,1.0f,1.0f,1.0f);
 
        if(ob->mode & OB_MODE_EDIT) {
-               dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, me->edit_mesh);
+               struct {EditMesh *em; short has_mcol; short has_mtface;} data;
+
+               data.em= me->edit_mesh;
+               data.has_mcol= CustomData_has_layer(&me->edit_mesh->fdata, CD_MCOL);
+               data.has_mtface= CustomData_has_layer(&me->edit_mesh->fdata, CD_MTFACE);
+
+               dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, &data);
        }
        else if(faceselect) {
                if(ob->mode & OB_MODE_WEIGHT_PAINT)
index 946a0948fee1c2935f505b324cee8152ff2e823f..c259239a0038a7726d591a60be5903d9115eb459 100644 (file)
@@ -139,7 +139,7 @@ static void drawNavMeshColored(DerivedMesh *dm)
        glEnable(GL_LIGHTING);
 }
 
-static void navDM_drawFacesTex(DerivedMesh *dm, int (*setDrawOptions)(MTFace *tface, MCol *mcol, int matnr))
+static void navDM_drawFacesTex(DerivedMesh *dm, int (*setDrawOptions)(MTFace *tface, int has_mcol, int matnr))
 {
        (void) setDrawOptions;
 
index d9039a2a68d734472db1ed41fd78d0d11cb37ee0..d99a23c28b55dd2ad95c1901836050fa71249cbf 100644 (file)
@@ -829,7 +829,7 @@ static int CheckTexfaceDM(void *mcol, int index)
 }
 */
 
-static int CheckTexDM(MTFace *tface, MCol *mcol, int matnr)
+static int CheckTexDM(MTFace *tface, int has_mcol, int matnr)
 {
 
        // index is the original face index, retrieve the polygon
@@ -844,7 +844,7 @@ static int CheckTexDM(MTFace *tface, MCol *mcol, int matnr)
                        // don't use mcol
                        return 2;
                }
-               if (!mcol) {
+               if (!has_mcol) {
                        // we have to set the color from the material
                        unsigned char rgba[4];
                        current_polymat->GetMaterialRGBAColor(rgba);