[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45591] trunk/blender/release/scripts: bmesh todo: vertex dirtmap now working again.
Campbell Barton
ideasman42 at gmail.com
Fri Apr 13 10:41:30 CEST 2012
Revision: 45591
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45591
Author: campbellbarton
Date: 2012-04-13 08:41:30 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
bmesh todo: vertex dirtmap now working again.
also renamed Polygon helper property from 'loops' to loop_indices
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2012-04-13 08:18:54 UTC (rev 45590)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2012-04-13 08:41:30 UTC (rev 45591)
@@ -457,7 +457,7 @@
return [ord_ind(verts[i], verts[(i + 1) % vlen]) for i in range(vlen)]
@property
- def loops(self):
+ def loop_indices(self):
start = self.loop_start
end = start + self.loop_total
return range(start, end)
Modified: trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py 2012-04-13 08:18:54 UTC (rev 45590)
+++ trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py 2012-04-13 08:41:30 UTC (rev 45591)
@@ -60,8 +60,8 @@
vidx_target = face_target.vertices
uv_layer = me.uv_loop_layers.active.data
- uvs_source = [uv_layer[i].uv for i in face_source.loops]
- uvs_target = [uv_layer[i].uv for i in face_target.loops]
+ uvs_source = [uv_layer[i].uv for i in face_source.loop_indices]
+ uvs_target = [uv_layer[i].uv for i in face_target.loop_indices]
# vertex index is the key, uv is the value
Modified: trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py 2012-04-13 08:18:54 UTC (rev 45590)
+++ trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py 2012-04-13 08:41:30 UTC (rev 45591)
@@ -759,7 +759,7 @@
__slost__= "v", "uv", "no", "area", "edge_keys"
def __init__(self, face, uv_layer, mesh_verts):
self.v = [mesh_verts[i] for i in face.vertices]
- self.uv = [uv_layer[i].uv for i in face.loops]
+ self.uv = [uv_layer[i].uv for i in face.loop_indices]
self.no = face.normal
self.area = face.area
Modified: trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py 2012-04-13 08:18:54 UTC (rev 45590)
+++ trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py 2012-04-13 08:41:30 UTC (rev 45591)
@@ -26,8 +26,6 @@
from mathutils import Vector
from math import acos
- #BPyMesh.meshCalcNormals(me)
-
vert_tone = [0.0] * len(me.vertices)
min_tone = 180.0
@@ -95,7 +93,7 @@
tone_range = max_tone - min_tone
if not tone_range:
- return
+ return {'CANCELLED'}
active_col_layer = None
@@ -109,18 +107,17 @@
active_col_layer = me.vertex_colors[0].data
if not active_col_layer:
- return('CANCELLED', )
+ return
- for i, f in enumerate(me.faces):
- if not me.use_paint_mask or f.select:
+ use_paint_mask = me.use_paint_mask
- f_col = active_col_layer[i]
-
- f_col = [f_col.color1, f_col.color2, f_col.color3, f_col.color4]
-
- for j, v in enumerate(f.vertices):
- col = f_col[j]
- tone = vert_tone[me.vertices[v].index]
+ for i, p in enumerate(me.polygons):
+ if not use_paint_mask or p.select:
+ for loop_index in p.loop_indices:
+ loop = me.loops[loop_index]
+ v = loop.vertex_index
+ col = active_col_layer[loop_index].color
+ tone = vert_tone[v]
tone = (tone - min_tone) / tone_range
if dirt_only:
@@ -131,7 +128,9 @@
col[1] = tone * col[1]
col[2] = tone * col[2]
+ return {'FINISHED'}
+
import bpy
from bpy.types import Operator
from bpy.props import FloatProperty, IntProperty, BoolProperty
@@ -185,8 +184,8 @@
t = time.time()
- applyVertexDirt(mesh, self.blur_iterations, self.blur_strength, radians(self.dirt_angle), radians(self.clean_angle), self.dirt_only)
+ ret = applyVertexDirt(mesh, self.blur_iterations, self.blur_strength, radians(self.dirt_angle), radians(self.clean_angle), self.dirt_only)
print('Dirt calculated in %.6f' % (time.time() - t))
- return {'FINISHED'}
+ return ret
More information about the Bf-blender-cvs
mailing list