[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24209] trunk/blender: * Some guideline work for the particle py file.
Thomas Dinges
dingto at gmx.de
Sun Nov 1 11:45:43 CET 2009
Revision: 24209
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24209
Author: dingto
Date: 2009-11-01 11:45:42 +0100 (Sun, 01 Nov 2009)
Log Message:
-----------
* Some guideline work for the particle py file.
* Minor layout tweaks in Node RNA to match most other RNA enums.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_particle.py
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
Modified: trunk/blender/release/scripts/ui/properties_particle.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_particle.py 2009-11-01 08:23:53 UTC (rev 24208)
+++ trunk/blender/release/scripts/ui/properties_particle.py 2009-11-01 10:45:42 UTC (rev 24209)
@@ -439,14 +439,14 @@
row.template_list(psys, "targets", psys, "active_particle_target_index")
col = row.column()
- subrow = col.row()
- subcol = subrow.column(align=True)
- subcol.itemO("particle.new_target", icon='ICON_ZOOMIN', text="")
- subcol.itemO("particle.remove_target", icon='ICON_ZOOMOUT', text="")
- subrow = col.row()
- subcol = subrow.column(align=True)
- subcol.itemO("particle.target_move_up", icon='VICON_MOVE_UP', text="")
- subcol.itemO("particle.target_move_down", icon='VICON_MOVE_DOWN', text="")
+ sub = col.row()
+ subsub = sub.column(align=True)
+ subsub.itemO("particle.new_target", icon='ICON_ZOOMIN', text="")
+ subsub.itemO("particle.remove_target", icon='ICON_ZOOMOUT', text="")
+ sub = col.row()
+ subsub = sub.column(align=True)
+ subsub.itemO("particle.target_move_up", icon='VICON_MOVE_UP', text="")
+ subsub.itemO("particle.target_move_down", icon='VICON_MOVE_DOWN', text="")
key = psys.active_particle_target
if key:
@@ -462,11 +462,11 @@
col.itemR(key, "time")
col.itemR(key, "duration")
else:
- subrow = row.row()
+ sub = row.row()
#doesn't work yet
#subrow.red_alert = key.valid
- subrow.itemR(key, "object", text="")
- subrow.itemR(key, "system", text="System")
+ sub.itemR(key, "object", text="")
+ sub.itemR(key, "system", text="System")
layout.itemR(key, "mode", expand=True)
@@ -517,14 +517,14 @@
row.template_list(state, "rules", state, "active_boid_rule_index")
col = row.column()
- subrow = col.row()
- subcol = subrow.column(align=True)
- subcol.item_menu_enumO("boid.rule_add", "type", icon='ICON_ZOOMIN', text="")
- subcol.itemO("boid.rule_del", icon='ICON_ZOOMOUT', text="")
- subrow = col.row()
- subcol = subrow.column(align=True)
- subcol.itemO("boid.rule_move_up", icon='VICON_MOVE_UP', text="")
- subcol.itemO("boid.rule_move_down", icon='VICON_MOVE_DOWN', text="")
+ sub = col.row()
+ subsub = sub.column(align=True)
+ subsub.item_menu_enumO("boid.rule_add", "type", icon='ICON_ZOOMIN', text="")
+ subsub.itemO("boid.rule_del", icon='ICON_ZOOMOUT', text="")
+ sub = col.row()
+ subcol = sub.column(align=True)
+ subsub.itemO("boid.rule_move_up", icon='VICON_MOVE_UP', text="")
+ subsub.itemO("boid.rule_move_down", icon='VICON_MOVE_DOWN', text="")
rule = state.active_boid_rule
@@ -619,19 +619,19 @@
return
sub.itemR(part, "render_strand")
- colsub = sub.column()
- colsub.active = part.render_strand == False
- colsub.itemR(part, "render_adaptive")
- colsub = sub.column()
- colsub.active = part.render_adaptive or part.render_strand == True
- colsub.itemR(part, "adaptive_angle")
- colsub = sub.column()
- colsub.active = part.render_adaptive == True and part.render_strand == False
- colsub.itemR(part, "adaptive_pix")
+ subsub = sub.column()
+ subsub.active = part.render_strand == False
+ subsub.itemR(part, "render_adaptive")
+ subsub = sub.column()
+ subsub.active = part.render_adaptive or part.render_strand == True
+ subsub.itemR(part, "adaptive_angle")
+ subsub = sub.column()
+ subsub.active = part.render_adaptive == True and part.render_strand == False
+ subsub.itemR(part, "adaptive_pix")
sub.itemR(part, "hair_bspline")
sub.itemR(part, "render_step", text="Steps")
+
sub = split.column()
-
sub.itemL(text="Timing:")
sub.itemR(part, "abs_path_time")
sub.itemR(part, "path_start", text="Start", slider=not part.abs_path_time)
@@ -650,9 +650,9 @@
row.itemR(part, "simplify_transition")
row = layout.row()
row.itemR(part, "viewport")
- subrow = row.row()
- subrow.active = part.viewport == True
- subrow.itemR(part, "simplify_viewport")
+ sub = row.row()
+ sub.active = part.viewport == True
+ sub.itemR(part, "simplify_viewport")
elif part.ren_as == 'OBJECT':
sub.itemR(part, "dupli_object")
@@ -662,27 +662,27 @@
split = layout.split()
sub = split.column()
sub.itemR(part, "whole_group")
- colsub = sub.column()
- colsub.active = part.whole_group == False
- colsub.itemR(part, "use_group_count")
+ subsub = sub.column()
+ subsub.active = part.whole_group == False
+ subsub.itemR(part, "use_group_count")
sub = split.column()
- colsub = sub.column()
- colsub.active = part.whole_group == False
- colsub.itemR(part, "use_global_dupli")
- colsub.itemR(part, "rand_group")
+ subsub = sub.column()
+ subsub.active = part.whole_group == False
+ subsub.itemR(part, "use_global_dupli")
+ subsub.itemR(part, "rand_group")
if part.use_group_count and not part.whole_group:
row = layout.row()
row.template_list(part, "dupliweights", part, "active_dupliweight_index")
col = row.column()
- subrow = col.row()
- subcol = subrow.column(align=True)
- subcol.itemO("particle.dupliob_copy", icon='ICON_ZOOMIN', text="")
- subcol.itemO("particle.dupliob_remove", icon='ICON_ZOOMOUT', text="")
- subcol.itemO("particle.dupliob_move_up", icon='VICON_MOVE_UP', text="")
- subcol.itemO("particle.dupliob_move_down", icon='VICON_MOVE_DOWN', text="")
+ sub = col.row()
+ subsub = sub.column(align=True)
+ subsub.itemO("particle.dupliob_copy", icon='ICON_ZOOMIN', text="")
+ subsub.itemO("particle.dupliob_remove", icon='ICON_ZOOMOUT', text="")
+ subsub.itemO("particle.dupliob_move_up", icon='VICON_MOVE_UP', text="")
+ subsub.itemO("particle.dupliob_move_down", icon='VICON_MOVE_DOWN', text="")
weight = part.active_dupliweight
if weight:
@@ -788,10 +788,10 @@
if (path):
col.itemR(part, "draw_step")
else:
- subcol = col.column()
- subcol.active = part.material_color == False
- #subcol.itemL(text="color")
- #subcol.itemL(text="Override material color")
+ sub = col.column()
+ sub.active = part.material_color == False
+ #sub.itemL(text="color")
+ #sub.itemL(text="Override material color")
class PARTICLE_PT_children(ParticleButtonsPanel):
@@ -864,11 +864,11 @@
split = layout.split()
- sub = split.column()
- sub.itemR(part, "kink_amplitude")
- sub.itemR(part, "kink_frequency")
- sub = split.column()
- sub.itemR(part, "kink_shape", slider=True)
+ col = split.column()
+ col.itemR(part, "kink_amplitude")
+ col.itemR(part, "kink_frequency")
+ col = split.column()
+ col.itemR(part, "kink_shape", slider=True)
class PARTICLE_PT_field_weights(ParticleButtonsPanel):
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2009-11-01 08:23:53 UTC (rev 24208)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2009-11-01 10:45:42 UTC (rev 24209)
@@ -59,15 +59,13 @@
{12, "HUE", 0, "Hue", ""},
{16, "SOFT_LIGHT", 0, "Soft Light", ""},
{17, "LINEAR_LIGHT", 0, "Linear Light",""},
- {0, NULL, 0, NULL, NULL}
-};
+ {0, NULL, 0, NULL, NULL}};
static EnumPropertyItem node_flip_items[] = {
{0, "X", 0, "Flip X", ""},
{1, "Y", 0, "Flip Y", ""},
{2, "XY", 0, "Flip X & Y", ""},
- {0, NULL, 0, NULL, NULL}
-};
+ {0, NULL, 0, NULL, NULL}};
static EnumPropertyItem node_math_items[] = {
{ 0, "ADD", 0, "Add", ""},
@@ -87,8 +85,7 @@
{14, "ROUND", 0, "Round", ""},
{15, "LESS_THAN", 0, "Less Than", ""},
{16, "GREATER_THAN", 0, "Greater Than", ""},
- {0, NULL, 0, NULL, NULL}
-};
+ {0, NULL, 0, NULL, NULL}};
static EnumPropertyItem node_vec_math_items[] = {
{0, "ADD", 0, "Add", ""},
@@ -97,8 +94,7 @@
{3, "DOT_PRODUCT", 0, "Dot Product", ""},
{4, "CROSS_PRODUCT", 0, "Cross Product", ""},
{5, "NORMALIZE", 0, "Normalize", ""},
- {0, NULL, 0, NULL, NULL}
-};
+ {0, NULL, 0, NULL, NULL}};
static EnumPropertyItem node_filter_items[] = {
{0, "SOFTEN", 0, "Soften", ""},
@@ -108,8 +104,7 @@
{4, "PREWITT", 0, "Prewitt", ""},
{5, "KIRSCH", 0, "Kirsch", ""},
{6, "SHADOW", 0, "Shadow", ""},
- {0, NULL, 0, NULL, NULL}
-};
+ {0, NULL, 0, NULL, NULL}};
#ifdef RNA_RUNTIME
@@ -583,8 +578,7 @@
{R_FILTER_FAST_GAUSS, "FAST_GAUSS", 0, "Fast Gaussian", ""},
{R_FILTER_CATROM, "CATROM", 0, "Catrom", ""},
{R_FILTER_MITCH, "MITCH", 0, "Mitch", ""},
- {0, NULL, 0, NULL, NULL}
- };
+ {0, NULL, 0, NULL, NULL}};
RNA_def_struct_sdna_from(srna, "NodeBlurData", "storage");
@@ -766,8 +760,7 @@
{3, "GREEN", 0, "G", "Green Channel"},
{4, "BLUE", 0, "B", "Blue Channel"},
{5, "LUMINANCE", 0, "L", "Luminance Channel"},
- {0, NULL, 0, NULL, NULL}
- };
+ {0, NULL, 0, NULL, NULL}};
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list