diff options
-rw-r--r-- | release/scripts/ui/properties_data_metaball.py | 4 | ||||
-rw-r--r-- | release/scripts/ui/space_view3d.py | 10 | ||||
-rw-r--r-- | release/scripts/ui/space_view3d_toolbar.py | 12 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_meta.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sculpt_paint.c | 12 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 2 |
7 files changed, 23 insertions, 23 deletions
diff --git a/release/scripts/ui/properties_data_metaball.py b/release/scripts/ui/properties_data_metaball.py index ebe21a6e623..83e5e642d0e 100644 --- a/release/scripts/ui/properties_data_metaball.py +++ b/release/scripts/ui/properties_data_metaball.py @@ -64,8 +64,8 @@ class DATA_PT_metaball(DataButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Resolution:") sub = col.column(align=True) - sub.prop(mball, "wire_size", text="View") - sub.prop(mball, "render_size", text="Render") + sub.prop(mball, "resolution", text="View") + sub.prop(mball, "render_resolution", text="Render") col = split.column() col.label(text="Settings:") diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 36502564e1f..2dc4b9cfabb 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -1011,9 +1011,9 @@ class VIEW3D_MT_sculpt(bpy.types.Menu): sculpt = tool_settings.sculpt brush = tool_settings.sculpt.brush - layout.prop(sculpt, "symmetry_x") - layout.prop(sculpt, "symmetry_y") - layout.prop(sculpt, "symmetry_z") + layout.prop(sculpt, "use_symmetry_x") + layout.prop(sculpt, "use_symmetry_y") + layout.prop(sculpt, "use_symmetry_z") layout.separator() layout.prop(sculpt, "lock_x") layout.prop(sculpt, "lock_y") @@ -1038,7 +1038,7 @@ class VIEW3D_MT_sculpt(bpy.types.Menu): layout.operator("sculpt.set_persistent_base") layout.separator() - layout.prop(sculpt, "use_openmp", text="Threaded Sculpt") + layout.prop(sculpt, "use_threaded", text="Threaded Sculpt") layout.prop(sculpt, "show_brush") # TODO, make availabel from paint menu! @@ -2063,7 +2063,7 @@ class VIEW3D_PT_view3d_display(bpy.types.Panel): row.prop(region, "show_sync_view") row = col.row() row.enabled = region.lock_rotation and region.show_sync_view - row.prop(region, "box_clip") + row.prop(region, "use_box_clip") class VIEW3D_PT_view3d_meshdisplay(bpy.types.Panel): diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py index 4ff90c53d3c..f99044281b5 100644 --- a/release/scripts/ui/space_view3d_toolbar.py +++ b/release/scripts/ui/space_view3d_toolbar.py @@ -998,7 +998,7 @@ class VIEW3D_PT_sculpt_options(PaintPanel, bpy.types.Panel): col = split.column() - col.prop(sculpt, "use_openmp", text="Threaded Sculpt") + col.prop(sculpt, "use_threaded", text="Threaded Sculpt") col.prop(sculpt, "show_low_resolution") col.prop(sculpt, "show_brush") @@ -1037,13 +1037,13 @@ class VIEW3D_PT_sculpt_symmetry(PaintPanel, bpy.types.Panel): col = split.column() col.label(text="Mirror:") - col.prop(sculpt, "symmetry_x", text="X") - col.prop(sculpt, "symmetry_y", text="Y") - col.prop(sculpt, "symmetry_z", text="Z") + col.prop(sculpt, "use_symmetry_x", text="X") + col.prop(sculpt, "use_symmetry_y", text="Y") + col.prop(sculpt, "use_symmetry_z", text="Z") col = split.column() - col.prop(sculpt, "radial_symm", text="Radial") + col.prop(sculpt, "radial_symmetry", text="Radial") col = layout.column() @@ -1196,7 +1196,7 @@ class VIEW3D_PT_tools_projectpaint(View3DPanel, bpy.types.Panel): sub = col.column() sub.active = use_projection sub.prop(ipaint, "use_occlude") - sub.prop(ipaint, "use_backface_cull") + sub.prop(ipaint, "use_backface_culling") split = layout.split() diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c index ec5f2a91709..0de8455bdb7 100644 --- a/source/blender/makesrna/intern/rna_meta.c +++ b/source/blender/makesrna/intern/rna_meta.c @@ -208,13 +208,13 @@ static void rna_def_metaball(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_MetaBall_update_data"); /* number values */ - prop= RNA_def_property(srna, "wire_size", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "resolution", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "wiresize"); RNA_def_property_range(prop, 0.050f, 1.0f); RNA_def_property_ui_text(prop, "Wire Size", "Polygonization resolution in the 3D viewport"); RNA_def_property_update(prop, 0, "rna_MetaBall_update_data"); - prop= RNA_def_property(srna, "render_size", PROP_FLOAT, PROP_DISTANCE); + prop= RNA_def_property(srna, "render_resolution", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "rendersize"); RNA_def_property_range(prop, 0.050f, 1.0f); RNA_def_property_ui_text(prop, "Render Size", "Polygonization resolution in rendering"); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 68ddfd9ef06..f8da299ec8e 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -632,7 +632,7 @@ static void rna_def_modifier_multires(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Total Levels", "Number of subdivisions for which displacements are stored"); - prop= RNA_def_property(srna, "external", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_external", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_boolean_funcs(prop, "rna_MultiresModifier_external_get", NULL); RNA_def_property_ui_text(prop, "External", "Store multires displacements outside the .blend file, to save memory"); diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index c9e07000f26..ca51708500d 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -202,22 +202,22 @@ static void rna_def_sculpt(BlenderRNA *brna) srna= RNA_def_struct(brna, "Sculpt", "Paint"); RNA_def_struct_ui_text(srna, "Sculpt", ""); - prop= RNA_def_property(srna, "radial_symm", PROP_INT, PROP_XYZ); + prop= RNA_def_property(srna, "radial_symmetry", PROP_INT, PROP_XYZ); RNA_def_property_int_sdna(prop, NULL, "radial_symm"); RNA_def_property_int_default(prop, 1); RNA_def_property_range(prop, 1, 64); RNA_def_property_ui_range(prop, 0, 32, 1, 1); RNA_def_property_ui_text(prop, "Radial Symmetry Count X Axis", "Number of times to copy strokes across the surface"); - prop= RNA_def_property(srna, "symmetry_x", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_symmetry_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_SYMM_X); RNA_def_property_ui_text(prop, "Symmetry X", "Mirror brush across the X axis"); - prop= RNA_def_property(srna, "symmetry_y", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_symmetry_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_SYMM_Y); RNA_def_property_ui_text(prop, "Symmetry Y", "Mirror brush across the Y axis"); - prop= RNA_def_property(srna, "symmetry_z", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_symmetry_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_SYMM_Z); RNA_def_property_ui_text(prop, "Symmetry Z", "Mirror brush across the Z axis"); @@ -237,7 +237,7 @@ static void rna_def_sculpt(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_SYMMETRY_FEATHER); RNA_def_property_ui_text(prop, "Symmetry Feathering", "Reduce the strength of the brush where it overlaps symmetrical daubs"); - prop= RNA_def_property(srna, "use_openmp", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_threaded", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", SCULPT_USE_OPENMP); RNA_def_property_ui_text(prop, "Use OpenMP", "Take advantage of multiple CPU cores to improve sculpting performance"); } @@ -291,7 +291,7 @@ static void rna_def_image_paint(BlenderRNA *brna) RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_XRAY); RNA_def_property_ui_text(prop, "Occlude", "Only paint onto the faces directly under the brush (slower)"); - prop= RNA_def_property(srna, "use_backface_cull", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_backface_culling", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_BACKFACE); RNA_def_property_ui_text(prop, "Cull", "Ignore faces pointing away from the view (faster)"); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 25699c6992d..f74621e8419 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1184,7 +1184,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Box", "Sync view position between side views"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, "rna_RegionView3D_quadview_update"); - prop= RNA_def_property(srna, "box_clip", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_box_clip", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "viewlock", RV3D_BOXCLIP); RNA_def_property_ui_text(prop, "Clip", "Clip objects based on what's visible in other side views"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, "rna_RegionView3D_quadview_update"); |