Revision: 20520
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20520
Author: yukishiro
Date: 2009-05-30 19:33:37 +0200 (Sat, 30 May 2009)
Log Message:
-----------
merge from 20489 to 20519
Modified Paths:
--------------
branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py
branches/soc-2009-yukishiro/release/ui/buttons_data_modifier.py
branches/soc-2009-yukishiro/release/ui/buttons_material.py
branches/soc-2009-yukishiro/release/ui/buttons_physic_cloth.py
branches/soc-2009-yukishiro/release/ui/buttons_scene.py
branches/soc-2009-yukishiro/release/ui/space_outliner.py
branches/soc-2009-yukishiro/source/blender/editors/datafiles/B.blend.c
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_define.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ID.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_text.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_files.c
branches/soc-2009-yukishiro/source/blender/windowmanager/wm.h
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
2009-05-30 13:47:30 UTC (rev 20519)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
2009-05-30 17:33:37 UTC (rev 20520)
@@ -63,11 +63,12 @@
sub.itemR(cam, "show_title_safe", text="Title Safe")
sub.itemR(cam, "show_name", text="Name")
- sub = split.column()
- sub.itemR(cam, "show_passepartout", text="Passepartout")
- if (cam.show_passepartout):
- sub.itemR(cam, "passepartout_alpha", text="Alpha",
slider=True)
- sub.itemR(cam, "draw_size", text="Size")
+ col = split.column()
+ col.itemR(cam, "show_passepartout", text="Passepartout")
+ colsub = col.column()
+ colsub.active = cam.show_passepartout
+ colsub.itemR(cam, "passepartout_alpha", text="Alpha",
slider=True)
+ col.itemR(cam, "draw_size", text="Size")
bpy.types.register(DATA_PT_cameralens)
bpy.types.register(DATA_PT_cameradisplay)
\ No newline at end of file
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
2009-05-30 13:47:30 UTC (rev 20519)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_curve.py
2009-05-30 17:33:37 UTC (rev 20520)
@@ -22,14 +22,16 @@
split = layout.split()
- sub = split.column()
- sub.itemL(text="Caps:")
- sub.itemR(curve, "front")
- sub.itemR(curve, "back")
+ col = split.column()
+ colsub = col.column()
+ colsub.active = curve.curve_2d
+ colsub.itemL(text="Caps:")
+ colsub.itemR(curve, "front")
+ colsub.itemR(curve, "back")
- sub.itemL(text="Textures:")
- sub.itemR(curve, "uv_orco")
- sub.itemR(curve, "auto_texspace")
+ col.itemL(text="Textures:")
+ col.itemR(curve, "uv_orco")
+ col.itemR(curve, "auto_texspace")
sub = split.column()
sub.itemL(text="Resolution:")
@@ -68,12 +70,17 @@
class DATA_PT_pathanim(DataButtonsPanel):
__idname__ = "DATA_PT_pathanim"
__label__ = "Path Animation"
+
+ def draw_header(self, context):
+ curve = context.active_object.data
+ layout = self.layout
+ layout.itemR(curve, "path", text="")
+
def draw(self, context):
curve = context.active_object.data
layout = self.layout
-
- layout.itemR(curve, "path", text="Enable")
+ layout.active = curve.path
split = layout.split()
@@ -102,9 +109,6 @@
sub.itemL(text="Order:")
sub.itemR(currentcurve, "order_u", text="U")
sub.itemR(currentcurve, "order_v", text="V")
- sub.itemL(text="Point Count:")
- sub.itemR(currentcurve, "point_count_u", text="U")
- sub.itemR(currentcurve, "point_count_v", text="V")
sub.itemL(text="Endpoints:")
sub.itemR(currentcurve, "endpoint_u", text="U")
sub.itemR(currentcurve, "endpoint_v", text="V")
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py 2009-05-30
13:47:30 UTC (rev 20519)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py 2009-05-30
17:33:37 UTC (rev 20520)
@@ -67,33 +67,33 @@
row.itemR(lamp, "sky")
row.itemR(lamp, "atmosphere")
- if lamp.sky or lamp.atmosphere:
- layout.itemR(lamp, "atmosphere_turbidity",
text="Turbidity")
+ row = layout.row()
+ row.active = lamp.sky or lamp.atmosphere
+ row.itemR(lamp, "atmosphere_turbidity", text="Turbidity")
- split = layout.split()
-
- col = split.column()
- if lamp.sky:
- sub = col.column()
- sub.itemR(lamp, "sky_blend_type", text="Blend
Type")
- sub.itemR(lamp, "sky_blend")
- sub.itemR(lamp, "sky_color_space", text="Color
Space")
- sub.itemR(lamp, "sky_exposure")
+ split = layout.split()
+
+ col = split.column()
+
+ sub = col.column()
+ sub.active = lamp.sky
+ sub.itemR(lamp, "sky_blend_type", text="Blend Type")
+ sub.itemR(lamp, "sky_blend")
+ sub.itemR(lamp, "sky_color_space", text="Color Space")
+ sub.itemR(lamp, "sky_exposure")
+ sub.itemR(lamp, "horizon_brightness", text="Hor Bright")
+ sub.itemR(lamp, "spread", text="Hor Spread")
+ sub.itemR(lamp, "sun_brightness", text="Sun Bright")
+ sub.itemR(lamp, "sun_size")
+ sub.itemR(lamp, "backscattered_light", text="Back Light")
- sub = col.column()
- sub.itemR(lamp, "horizon_brightness", text="Hor
Bright")
- sub.itemR(lamp, "spread", text="Hor Spread")
- sub.itemR(lamp, "sun_brightness", text="Sun
Bright")
- sub.itemR(lamp, "sun_size")
- sub.itemR(lamp, "backscattered_light",
text="Back Light")
+ sub = split.column()
+ sub.active = lamp.atmosphere
+ sub.itemR(lamp, "sun_intensity", text="Sun Intens")
+ sub.itemR(lamp, "atmosphere_inscattering", text="Inscattering")
+ sub.itemR(lamp, "atmosphere_extinction", text="Extinction")
+ sub.itemR(lamp, "atmosphere_distance_factor", text="Distance")
- sub = split.column()
- if lamp.atmosphere:
- sub.itemR(lamp, "sun_intensity", text="Sun
Intens")
- sub.itemR(lamp, "atmosphere_inscattering",
text="Inscattering")
- sub.itemR(lamp, "atmosphere_extinction",
text="Extinction")
- sub.itemR(lamp, "atmosphere_distance_factor",
text="Distance")
-
class DATA_PT_shadow(DataButtonsPanel):
__idname__ = "DATA_PT_shadow"
__label__ = "Shadow"
@@ -192,12 +192,13 @@
sub.itemR(lamp, "spot_blend", text="Blend")
sub.itemR(lamp, "square")
- sub = split.column()
- sub.itemR(lamp, "halo")
- if lamp.halo:
- sub.itemR(lamp, "halo_intensity", text="Intensity")
- if lamp.shadow_method == 'BUFFER_SHADOW':
- sub.itemR(lamp, "halo_step", text="Step")
+ col = split.column()
+ col.itemR(lamp, "halo")
+ colsub = col.column()
+ colsub.active = lamp.halo
+ colsub.itemR(lamp, "halo_intensity", text="Intensity")
+ if lamp.shadow_method == 'BUFFER_SHADOW':
+ colsub.itemR(lamp, "halo_step", text="Step")
bpy.types.register(DATA_PT_lamp)
bpy.types.register(DATA_PT_shadow)
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py 2009-05-30
13:47:30 UTC (rev 20519)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_mesh.py 2009-05-30
17:33:37 UTC (rev 20520)
@@ -1,4 +1,4 @@
-
+
import bpy
class DataButtonsPanel(bpy.types.Panel):
@@ -12,7 +12,7 @@
class DATA_PT_surface(DataButtonsPanel):
__idname__ = "DATA_PT_surface"
- __label__ = "Surface"
+ __label__ = "Mesh"
def draw(self, context):
mesh = context.active_object.data
@@ -20,13 +20,15 @@
split = layout.split()
+ col = split.column()
+ col.itemR(mesh, "autosmooth")
+ colsub = col.column()
+ colsub.active = mesh.autosmooth
+ colsub.itemR(mesh, "autosmooth_angle", text="Angle")
sub = split.column()
- sub.itemR(mesh, "autosmooth")
- sub.itemR(mesh, "autosmooth_angle", text="Angle")
- sub = split.column()
sub.itemR(mesh, "vertex_normal_flip")
sub.itemR(mesh, "double_sided")
layout.itemR(mesh, "texco_mesh")
-bpy.types.register(DATA_PT_surface)
\ No newline at end of file
+bpy.types.register(DATA_PT_surface)
\ No newline at end of file
Modified: branches/soc-2009-yukishiro/release/ui/buttons_data_modifier.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data_modifier.py
2009-05-30 13:47:30 UTC (rev 20519)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data_modifier.py
2009-05-30 17:33:37 UTC (rev 20520)
@@ -108,21 +108,28 @@
split = layout.split()
col = split.column()
- sub = col.column()
- sub.itemR(md, "constant_offset")
- sub.itemR(md, "constant_offset_displacement",
text="Displacement")
- sub = col.column()
+ col = col.column()
+ col.itemR(md, "constant_offset")
+ colsub = col.column()
+ colsub.active = md.constant_offset
+ colsub.itemR(md, "constant_offset_displacement",
text="Displacement")
sub = col.row().itemR(md, "merge_adjacent_vertices",
text="Merge")
- sub = col.row().itemR(md, "merge_end_vertices", text="First
Last")
- sub = col.itemR(md, "merge_distance", text="Distance")
+ colsub = col.column()
+ colsub.active = md.merge_adjacent_vertices
+ colsub.itemR(md, "merge_end_vertices", text="First Last")
+ colsub.itemR(md, "merge_distance", text="Distance")
col = split.column()
- sub = col.column()
- sub.itemR(md, "relative_offset")
- sub.itemR(md, "relative_offset_displacement",
text="Displacement")
- sub = col.column()
- sub.itemR(md, "add_offset_object")
- sub.itemR(md, "offset_object")
+ col = col.column()
+ col.itemR(md, "relative_offset")
+ colsub = col.column()
+ colsub.active = md.relative_offset
+ colsub.itemR(md, "relative_offset_displacement",
text="Displacement")
+ col = col.column()
+ col.itemR(md, "add_offset_object")
+ colsub = col.column()
+ colsub.active = md.add_offset_object
+ colsub.itemR(md, "offset_object")
col = layout.column()
col.itemR(md, "start_cap")
@@ -148,14 +155,20 @@
layout.itemR(md, "object")
def build(self, layout, md):
- layout.itemR(md, "start")
- layout.itemR(md, "length")
+ split = layout.split()
+
+ col = split.column()
+ col.itemR(md, "start")
+ col.itemR(md, "length")
- row = layout.row()
- row.itemR(md, "randomize")
- if md.randomize:
- row.itemR(md, "seed")
+ col = split.column()
+ col.itemR(md, "randomize")
+ colsub = col.column()
+ colsub.active = md.randomize
+ colsub.itemR(md, "seed")
+
+
def cast(self, layout, md):
layout.itemR(md, "cast_type")
col = layout.column_flow()
@@ -195,11 +208,16 @@
layout.itemR(md, "uv_layer")
def edgesplit(self, layout, md):
- layout.itemR(md, "use_edge_angle", text="Edge Angle")
- if (md.use_edge_angle):
- layout.itemR(md, "split_angle")
- layout.itemR(md, "use_sharp", text="Sharp Edges")
+ split = layout.split()
+ col = split.column()
+ col.itemR(md, "use_edge_angle", text="Edge Angle")
+ colsub = col.column()
+ colsub.active = md.use_edge_angle
+ colsub.itemR(md, "split_angle")
+ col = split.column()
+ col.itemR(md, "use_sharp", text="Sharp Edges")
+
def explode(self, layout, md):
layout.itemR(md, "vertex_group")
layout.itemR(md, "protect")
@@ -248,6 +266,7 @@
sub.itemR(md, "y")
sub.itemR(md, "z")
sub = split.column()
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
