[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56234] trunk/blender: rna attribute consistency edits, use common prefix for booleans.
Campbell Barton
ideasman42 at gmail.com
Tue Apr 23 09:06:41 CEST 2013
Revision: 56234
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56234
Author: campbellbarton
Date: 2013-04-23 07:06:29 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
rna attribute consistency edits, use common prefix for booleans.
Modified Paths:
--------------
trunk/blender/release/scripts/freestyle/style_modules/parameter_editor.py
trunk/blender/release/scripts/startup/bl_operators/rigidbody.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/release/scripts/startup/bl_ui/properties_freestyle.py
trunk/blender/release/scripts/startup/bl_ui/properties_game.py
trunk/blender/release/scripts/startup/bl_ui/properties_object.py
trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
trunk/blender/release/scripts/startup/bl_ui/space_image.py
trunk/blender/release/scripts/startup/bl_ui/space_node.py
trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/makesrna/intern/rna_brush.c
trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/makesrna/intern/rna_linestyle.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/makesrna/intern/rna_rigidbody.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_smoke.c
Modified: trunk/blender/release/scripts/freestyle/style_modules/parameter_editor.py
===================================================================
--- trunk/blender/release/scripts/freestyle/style_modules/parameter_editor.py 2013-04-23 05:29:06 UTC (rev 56233)
+++ trunk/blender/release/scripts/freestyle/style_modules/parameter_editor.py 2013-04-23 07:06:29 UTC (rev 56234)
@@ -59,24 +59,24 @@
def blend(self, v1, v2):
fac = self.__influence
facm = 1.0 - fac
- if self.__blend == "MIX":
+ if self.__blend == 'MIX':
v1 = facm * v1 + fac * v2
- elif self.__blend == "ADD":
+ elif self.__blend == 'ADD':
v1 += fac * v2
- elif self.__blend == "MULTIPLY":
+ elif self.__blend == 'MULTIPLY':
v1 *= facm + fac * v2;
- elif self.__blend == "SUBTRACT":
+ elif self.__blend == 'SUBTRACT':
v1 -= fac * v2
- elif self.__blend == "DIVIDE":
+ elif self.__blend == 'DIVIDE':
if v2 != 0.0:
v1 = facm * v1 + fac * v1 / v2
- elif self.__blend == "DIFFERENCE":
+ elif self.__blend == 'DIFFERENCE':
v1 = facm * v1 + fac * abs(v1 - v2)
- elif self.__blend == "MININUM":
+ elif self.__blend == 'MININUM':
tmp = fac * v1
if v1 > tmp:
v1 = tmp
- elif self.__blend == "MAXIMUM":
+ elif self.__blend == 'MAXIMUM':
tmp = fac * v1
if v1 < tmp:
v1 = tmp
@@ -87,7 +87,7 @@
class CurveMappingModifier(ScalarBlendModifier):
def __init__(self, blend, influence, mapping, invert, curve):
ScalarBlendModifier.__init__(self, blend, influence)
- assert mapping in ("LINEAR", "CURVE")
+ assert mapping in {'LINEAR', 'CURVE'}
self.__mapping = getattr(self, mapping)
self.__invert = invert
self.__curve = curve
@@ -103,7 +103,7 @@
class ThicknessModifierMixIn:
def __init__(self):
scene = freestyle.getCurrentScene()
- self.__persp_camera = (scene.camera.data.type == "PERSP")
+ self.__persp_camera = (scene.camera.data.type == 'PERSP')
def set_thickness(self, sv, outer, inner):
fe = sv.first_svertex.get_fedge(sv.second_svertex)
nature = fe.nature
@@ -129,16 +129,16 @@
self.__position = position
self.__ratio = ratio
def blend_thickness(self, outer, inner, v):
- if self.__position == "CENTER":
+ if self.__position == 'CENTER':
outer = self.blend(outer, v / 2)
inner = self.blend(inner, v / 2)
- elif self.__position == "INSIDE":
+ elif self.__position == 'INSIDE':
outer = self.blend(outer, 0)
inner = self.blend(inner, v)
- elif self.__position == "OUTSIDE":
+ elif self.__position == 'OUTSIDE':
outer = self.blend(outer, v)
inner = self.blend(inner, 0)
- elif self.__position == "RELATIVE":
+ elif self.__position == 'RELATIVE':
outer = self.blend(outer, v * self.__ratio)
inner = self.blend(inner, v * (1 - self.__ratio))
else:
@@ -152,16 +152,16 @@
def __init__(self, thickness, position, ratio):
StrokeShader.__init__(self)
ThicknessModifierMixIn.__init__(self)
- if position == "CENTER":
+ if position == 'CENTER':
self.__outer = thickness / 2
self.__inner = thickness / 2
- elif position == "INSIDE":
+ elif position == 'INSIDE':
self.__outer = 0
self.__inner = thickness
- elif position == "OUTSIDE":
+ elif position == 'OUTSIDE':
self.__outer = thickness
self.__inner = 0
- elif position == "RELATIVE":
+ elif position == 'RELATIVE':
self.__outer = thickness * ratio
self.__inner = thickness * (1 - ratio)
else:
@@ -350,84 +350,76 @@
# Material modifiers
-def iter_material_color(stroke, material_attr):
+def iter_material_color(stroke, material_attribute):
func = CurveMaterialF0D()
it = stroke.stroke_vertices_begin()
while not it.is_end:
material = func(Interface0DIterator(it))
- if material_attr == "DIFF":
- color = (material.diffuse[0],
- material.diffuse[1],
- material.diffuse[2])
- elif material_attr == "SPEC":
- color = (material.specular[0],
- material.specular[1],
- material.specular[2])
+ if material_attribute == 'DIFF':
+ color = material.diffuse[:]
+ elif material_attribute == 'SPEC':
+ color = material.specular[:]
else:
- raise ValueError("unexpected material attribute: " + material_attr)
+ raise ValueError("unexpected material attribute: " + material_attribute)
yield it, color
it.increment()
-def iter_material_value(stroke, material_attr):
+def iter_material_value(stroke, material_attribute):
func = CurveMaterialF0D()
it = stroke.stroke_vertices_begin()
while not it.is_end:
material = func(Interface0DIterator(it))
- if material_attr == "DIFF":
- r = material.diffuse[0]
- g = material.diffuse[1]
- b = material.diffuse[2]
+ if material_attribute == 'DIFF':
+ r, g, b = material.diffuse
t = 0.35 * r + 0.45 * r + 0.2 * b
- elif material_attr == "DIFF_R":
+ elif material_attribute == 'DIFF_R':
t = material.diffuse[0]
- elif material_attr == "DIFF_G":
+ elif material_attribute == 'DIFF_G':
t = material.diffuse[1]
- elif material_attr == "DIFF_B":
+ elif material_attribute == 'DIFF_B':
t = material.diffuse[2]
- elif material_attr == "SPEC":
- r = material.specular[0]
- g = material.specular[1]
- b = material.specular[2]
+ elif material_attribute == 'SPEC':
+ r, g, b = material.specular
t = 0.35 * r + 0.45 * r + 0.2 * b
- elif material_attr == "SPEC_R":
+ elif material_attribute == 'SPEC_R':
t = material.specular[0]
- elif material_attr == "SPEC_G":
+ elif material_attribute == 'SPEC_G':
t = material.specular[1]
- elif material_attr == "SPEC_B":
+ elif material_attribute == 'SPEC_B':
t = material.specular[2]
- elif material_attr == "SPEC_HARDNESS":
+ elif material_attribute == 'SPEC_HARDNESS':
t = material.shininess
- elif material_attr == "ALPHA":
+ elif material_attribute == 'ALPHA':
t = material.diffuse[3]
else:
- raise ValueError("unexpected material attribute: " + material_attr)
+ raise ValueError("unexpected material attribute: " + material_attribute)
yield it, t
it.increment()
class ColorMaterialShader(ColorRampModifier):
- def __init__(self, blend, influence, ramp, material_attr, use_ramp):
+ def __init__(self, blend, influence, ramp, material_attribute, use_ramp):
ColorRampModifier.__init__(self, blend, influence, ramp)
- self.__material_attr = material_attr
+ self.__material_attribute = material_attribute
self.__use_ramp = use_ramp
def shade(self, stroke):
- if self.__material_attr in ["DIFF", "SPEC"] and not self.__use_ramp:
- for it, b in iter_material_color(stroke, self.__material_attr):
+ if self.__material_attribute in {'DIFF', 'SPEC'} and not self.__use_ramp:
+ for it, b in iter_material_color(stroke, self.__material_attribute):
sv = it.object
a = sv.attribute.color
sv.attribute.color = self.blend_ramp(a, b)
else:
- for it, t in iter_material_value(stroke, self.__material_attr):
+ for it, t in iter_material_value(stroke, self.__material_attribute):
sv = it.object
a = sv.attribute.color
b = self.evaluate(t)
sv.attribute.color = self.blend_ramp(a, b)
class AlphaMaterialShader(CurveMappingModifier):
- def __init__(self, blend, influence, mapping, invert, curve, material_attr):
+ def __init__(self, blend, influence, mapping, invert, curve, material_attribute):
CurveMappingModifier.__init__(self, blend, influence, mapping, invert, curve)
- self.__material_attr = material_attr
+ self.__material_attribute = material_attribute
def shade(self, stroke):
- for it, t in iter_material_value(stroke, self.__material_attr):
+ for it, t in iter_material_value(stroke, self.__material_attribute):
sv = it.object
a = sv.attribute.alpha
b = self.evaluate(t)
@@ -435,14 +427,14 @@
class ThicknessMaterialShader(ThicknessBlenderMixIn, CurveMappingModifier):
def __init__(self, thickness_position, thickness_ratio,
- blend, influence, mapping, invert, curve, material_attr, value_min, value_max):
+ blend, influence, mapping, invert, curve, material_attribute, value_min, value_max):
ThicknessBlenderMixIn.__init__(self, thickness_position, thickness_ratio)
CurveMappingModifier.__init__(self, blend, influence, mapping, invert, curve)
- self.__material_attr = material_attr
+ self.__material_attribute = material_attribute
self.__value_min = value_min
self.__value_max = value_max
def shade(self, stroke):
- for it, t in iter_material_value(stroke, self.__material_attr):
+ for it, t in iter_material_value(stroke, self.__material_attribute):
sv = it.object
a = sv.attribute.thickness
b = self.__value_min + self.evaluate(t) * (self.__value_max - self.__value_min)
@@ -453,12 +445,12 @@
class CalligraphicThicknessShader(ThicknessBlenderMixIn, ScalarBlendModifier):
def __init__(self, thickness_position, thickness_ratio,
- blend, influence, orientation, min_thickness, max_thickness):
+ blend, influence, orientation, thickness_min, thickness_max):
ThicknessBlenderMixIn.__init__(self, thickness_position, thickness_ratio)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list