[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60082] trunk/blender: code cleanup: unnecessary shadowing and some minor pep8 edits.
Campbell Barton
ideasman42 at gmail.com
Thu Sep 12 21:51:31 CEST 2013
Revision: 60082
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60082
Author: campbellbarton
Date: 2013-09-12 19:51:31 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
code cleanup: unnecessary shadowing and some minor pep8 edits.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/bmesh/operators/bmo_wireframe.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py 2013-09-12 19:15:45 UTC (rev 60081)
+++ trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py 2013-09-12 19:51:31 UTC (rev 60082)
@@ -106,9 +106,9 @@
)
mode = bpy.props.EnumProperty(
name="Torus Dimensions",
- items=(("MAJOR_MINOR", "Major/Minor",
+ items=(("MAJOR_MINOR", "Major/Minor",
"Use the major/minor radii for torus dimensions"),
- ("EXT_INT", "Exterior/Interior",
+ ("EXT_INT", "Exterior/Interior",
"Use the exterior/interior radii for torus dimensions")),
update=mode_update_callback,
)
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2013-09-12 19:15:45 UTC (rev 60081)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2013-09-12 19:51:31 UTC (rev 60082)
@@ -2614,7 +2614,7 @@
bl_region_type = 'UI'
bl_label = "Shading"
bl_options = {'DEFAULT_CLOSED'}
-
+
@classmethod
def poll(cls, context):
view = context.space_data
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-09-12 19:15:45 UTC (rev 60081)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-09-12 19:51:31 UTC (rev 60082)
@@ -913,7 +913,7 @@
row.prop(brush, "use_relative_jitter", text="", icon='UNLOCKED')
row.prop(brush, "jitter_absolute")
row.prop(brush, "use_pressure_jitter", toggle=True, text="")
-
+
if brush.sculpt_capabilities.has_smooth_stroke:
col = layout.column()
col.separator()
@@ -945,11 +945,10 @@
sub.active = brush.use_smooth_stroke
sub.prop(brush, "smooth_stroke_radius", text="Radius", slider=True)
sub.prop(brush, "smooth_stroke_factor", text="Factor", slider=True)
-
+
layout.prop(settings, "input_samples")
-
class VIEW3D_PT_tools_brush_curve(Panel, View3DPaintPanel):
bl_label = "Curve"
bl_options = {'DEFAULT_CLOSED'}
@@ -1217,7 +1216,7 @@
row = layout.row()
row.prop(ipaint, "use_normal_falloff")
-
+
sub = row.row()
sub.active = (ipaint.use_normal_falloff)
sub.prop(ipaint, "normal_angle", text="")
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2013-09-12 19:15:45 UTC (rev 60081)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2013-09-12 19:51:31 UTC (rev 60082)
@@ -3449,7 +3449,6 @@
{
KDTree *tree = NULL;
unsigned int tot = 0;
- float co[3];
switch (ob->type) {
case OB_MESH:
@@ -3471,6 +3470,7 @@
/* we don't how how many verts from the DM we can use */
for (i = 0; i < totvert; i++) {
if (index[i] != ORIGINDEX_NONE) {
+ float co[3];
mul_v3_m4v3(co, ob->obmat, mvert[i].co);
BLI_kdtree_insert(tree, index[i], co, NULL);
tot++;
@@ -3484,6 +3484,7 @@
tree = BLI_kdtree_new(tot);
for (i = 0; i < tot; i++) {
+ float co[3];
mul_v3_m4v3(co, ob->obmat, mvert[i].co);
BLI_kdtree_insert(tree, i, co, NULL);
}
@@ -3513,6 +3514,7 @@
bezt = nu->bezt;
a = nu->pntsu;
while (a--) {
+ float co[3];
mul_v3_m4v3(co, ob->obmat, bezt->vec[1]);
BLI_kdtree_insert(tree, i++, co, NULL);
bezt++;
@@ -3524,6 +3526,7 @@
bp = nu->bp;
a = nu->pntsu * nu->pntsv;
while (a--) {
+ float co[3];
mul_v3_m4v3(co, ob->obmat, bp->vec);
BLI_kdtree_insert(tree, i++, co, NULL);
bp++;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_wireframe.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_wireframe.c 2013-09-12 19:15:45 UTC (rev 60081)
+++ trunk/blender/source/blender/bmesh/operators/bmo_wireframe.c 2013-09-12 19:51:31 UTC (rev 60082)
@@ -165,8 +165,6 @@
int cd_edge_crease_offset = use_crease ? CustomData_get_offset(&bm->edata, CD_CREASE) : -1;
const float crease_weight = 1.0f;
- //CustomData_has_layer(&bm->edata, CD_CREASE);
-
const int totvert_orig = bm->totvert;
BMOIter oiter;
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2013-09-12 19:15:45 UTC (rev 60081)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2013-09-12 19:51:31 UTC (rev 60082)
@@ -3618,7 +3618,6 @@
View3D *v3d;
RegionView3D *rv3d;
ARegion *ar;
- float mousevec[3];
if (op->customdata) {
ViewOpsData *vod = op->customdata;
@@ -3630,9 +3629,6 @@
v3d = CTX_wm_view3d(C);
}
- negate_v3_v3(mousevec, ((RegionView3D *)ar->regiondata)->viewinv[2]);
- normalize_v3(mousevec);
-
rv3d = ar->regiondata;
if ((rv3d->persp != RV3D_CAMOB) || ED_view3d_camera_lock_check(v3d, rv3d)) {
const float angle = RNA_float_get(op->ptr, "angle");
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2013-09-12 19:15:45 UTC (rev 60081)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2013-09-12 19:51:31 UTC (rev 60082)
@@ -2600,7 +2600,7 @@
prop = RNA_def_property(srna, "top", PROP_INT, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_int_sdna(prop, NULL, "top");
- RNA_def_property_ui_text(prop, "Top Line", "Top line visible.");
+ RNA_def_property_ui_text(prop, "Top Line", "Top line visible");
prop = RNA_def_property(srna, "visible_lines", PROP_INT, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2013-09-12 19:15:45 UTC (rev 60081)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2013-09-12 19:51:31 UTC (rev 60082)
@@ -264,7 +264,6 @@
if (note->category == NC_SCREEN) {
if (note->data == ND_SCREENBROWSE) {
/* free popup handlers only [#35434] */
- wmWindow *win = CTX_wm_window(C);
UI_remove_popup_handlers_all(C, &win->modalhandlers);
More information about the Bf-blender-cvs
mailing list