[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21880] branches/itasc: svn merge -r 21866 :21879 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/ blender
Benoit Bolsee
benoit.bolsee at online.be
Sat Jul 25 14:53:09 CEST 2009
Revision: 21880
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21880
Author: ben2610
Date: 2009-07-25 14:53:09 +0200 (Sat, 25 Jul 2009)
Log Message:
-----------
svn merge -r 21866:21879 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Modified Paths:
--------------
branches/itasc/release/ui/buttons_material.py
branches/itasc/release/ui/space_console.py
branches/itasc/release/ui/space_view3d.py
branches/itasc/release/ui/space_view3d_toolbar.py
branches/itasc/source/blender/editors/armature/armature_intern.h
branches/itasc/source/blender/editors/armature/armature_ops.c
branches/itasc/source/blender/editors/armature/editarmature.c
branches/itasc/source/blender/editors/interface/view2d_ops.c
branches/itasc/source/blender/editors/space_console/space_console.c
branches/itasc/source/blender/editors/space_view3d/view3d_edit.c
branches/itasc/source/blender/editors/space_view3d/view3d_header.c
branches/itasc/source/blender/makesrna/intern/rna_material.c
branches/itasc/source/blender/makesrna/intern/rna_space.c
branches/itasc/source/blender/windowmanager/intern/wm_event_system.c
branches/itasc/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/itasc/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
Modified: branches/itasc/release/ui/buttons_material.py
===================================================================
--- branches/itasc/release/ui/buttons_material.py 2009-07-25 12:35:14 UTC (rev 21879)
+++ branches/itasc/release/ui/buttons_material.py 2009-07-25 12:53:09 UTC (rev 21880)
@@ -74,37 +74,36 @@
if mat:
layout.itemR(mat, "type", expand=True)
-
-
-# row = layout.row()
-
if mat.type == 'SURFACE':
split = layout.split()
sub = split.column()
+ sub.itemR(mat, "z_buffer")
sub.itemR(mat, "alpha", slider=True)
sub.itemR(mat, "ambient", slider=True)
sub.itemR(mat, "emit")
- sub.itemR(mat, "translucency", slider=True)
sub = split.column()
sub.itemR(mat, "shadeless")
sub.itemR(mat, "wireframe")
+
sub.itemR(mat, "tangent_shading")
sub.itemR(mat, "cubic", slider=True)
+
elif mat.type == 'VOLUME':
split = layout.split()
sub = split.column()
+ sub.itemR(mat, "z_buffer")
sub.itemR(mat, "alpha", slider=True)
sub.itemR(mat, "ambient", slider=True)
sub.itemR(mat, "emit")
- sub.itemR(mat, "translucency", slider=True)
sub = split.column()
sub.itemR(mat, "shadeless")
sub.itemR(mat, "wireframe")
+
sub.itemR(mat, "tangent_shading")
sub.itemR(mat, "cubic", slider=True)
elif mat.type == 'HALO':
@@ -218,10 +217,9 @@
sub = split.column()
sub.active = mat.shadeless== False
sub.itemR(mat, "diffuse_reflection", text="Intensity", slider=True)
+ sub.itemR(mat, "translucency", slider=True)
sub.itemR(mat, "object_color")
-
-
row = layout.row()
row.active = mat.shadeless== False
row.itemR(mat, "diffuse_shader", text="Shader")
@@ -242,8 +240,9 @@
sub = split.column()
sub.itemR(mat, "diffuse_fresnel_factor", text="Factor")
- layout.itemR(mat, "diffuse_ramp", text="Ramp")
-
+ layout.template_color_ramp(mat.diffuse_ramp, expand=True)
+
+
class MATERIAL_PT_specular(MaterialButtonsPanel):
__idname__= "MATERIAL_PT_specular"
__label__ = "Specular"
@@ -283,8 +282,9 @@
sub = split.column()
sub.itemR(mat, "specular_toon_smooth", text="Smooth")
- layout.itemR(mat, "specular_ramp", text="Ramp")
-
+ layout.template_color_ramp(mat.specular_ramp, expand=True)
+
+
class MATERIAL_PT_sss(MaterialButtonsPanel):
__idname__= "MATERIAL_PT_sss"
__label__ = "Subsurface Scattering"
Modified: branches/itasc/release/ui/space_console.py
===================================================================
--- branches/itasc/release/ui/space_console.py 2009-07-25 12:35:14 UTC (rev 21879)
+++ branches/itasc/release/ui/space_console.py 2009-07-25 12:53:09 UTC (rev 21880)
@@ -18,7 +18,7 @@
row = layout.row()
row.itemR(sc, "console_type", expand=True)
- if sc.type == 'REPORT':
+ if sc.console_type == 'REPORT':
if context.area.show_menus:
row = layout.row()
Modified: branches/itasc/release/ui/space_view3d.py
===================================================================
--- branches/itasc/release/ui/space_view3d.py 2009-07-25 12:35:14 UTC (rev 21879)
+++ branches/itasc/release/ui/space_view3d.py 2009-07-25 12:53:09 UTC (rev 21880)
@@ -1,6 +1,25 @@
import bpy
+# ********** Header ****************
+
+class VIEW3D_HT_header(bpy.types.Header):
+ __space_type__ = "VIEW_3D"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.template_header()
+
+ # menus
+ if context.area.show_menus:
+ row = layout.row()
+ row.itemM("VIEW3D_MT_view")
+
+ layout.template_header_3D()
+
+# ********** Menu ****************
+
class VIEW3D_MT_view_navigation(bpy.types.Menu):
__space_type__ = "VIEW_3D"
__label__ = "Navigation"
@@ -76,21 +95,8 @@
layout.itemO("screen.region_foursplit", text="Toggle Quad View")
layout.itemO("screen.screen_full_area", text="Toggle Full Screen")
-class VIEW3D_HT_header(bpy.types.Header):
- __space_type__ = "VIEW_3D"
+# ********** Panel ****************
- def draw(self, context):
- layout = self.layout
-
- layout.template_header()
-
- # menus
- if context.area.show_menus:
- row = layout.row()
- row.itemM("VIEW3D_MT_view")
-
- layout.template_header_3D()
-
class VIEW3D_PT_3dview_properties(bpy.types.Panel):
__space_type__ = "VIEW_3D"
__region_type__ = "UI"
@@ -101,22 +107,28 @@
return (view)
def draw(self, context):
+ layout = self.layout
+
view = context.space_data
scene = context.scene
- layout = self.layout
- split = layout.split()
- col = split.column()
+ col = layout.column()
col.itemR(view, "camera")
col.itemR(view, "lens")
- col.itemL(text="Clip:")
+
+ layout.itemL(text="Clip:")
+ col = layout.column(align=True)
col.itemR(view, "clip_start", text="Start")
col.itemR(view, "clip_end", text="End")
- col.itemL(text="Grid:")
+
+ layout.itemL(text="Grid:")
+ col = layout.column(align=True)
+ col.itemR(view, "grid_lines", text="Lines")
col.itemR(view, "grid_spacing", text="Spacing")
col.itemR(view, "grid_subdivisions", text="Subdivisions")
- col.itemR(scene, "cursor_location", text="3D Cursor:")
+ layout.column().itemR(scene, "cursor_location", text="3D Cursor:")
+
class VIEW3D_PT_3dview_display(bpy.types.Panel):
__space_type__ = "VIEW_3D"
__region_type__ = "UI"
@@ -127,11 +139,10 @@
return (view)
def draw(self, context):
+ layout = self.layout
view = context.space_data
- layout = self.layout
- split = layout.split()
- col = split.column()
+ col = layout.column()
col.itemR(view, "display_floor", text="Grid Floor")
col.itemR(view, "display_x_axis", text="X Axis")
col.itemR(view, "display_y_axis", text="Y Axis")
@@ -140,11 +151,21 @@
col.itemR(view, "all_object_centers")
col.itemR(view, "relationship_lines")
col.itemR(view, "textured_solid")
-
+
+ layout.itemS()
+
+ layout.itemO("screen.region_foursplit")
+
+ col = layout.column()
+ col.itemR(view, "lock_rotation")
+ col.itemR(view, "box_preview")
+ col.itemR(view, "box_clip")
+
class VIEW3D_PT_background_image(bpy.types.Panel):
__space_type__ = "VIEW_3D"
__region_type__ = "UI"
__label__ = "Background Image"
+ __default_closed__ = True
def poll(self, context):
view = context.space_data
@@ -158,9 +179,10 @@
layout.itemR(view, "display_background_image", text="")
def draw(self, context):
+ layout = self.layout
+
view = context.space_data
bg = context.space_data.background_image
- layout = self.layout
layout.active = view.display_background_image
split = layout.split()
@@ -179,5 +201,3 @@
bpy.types.register(VIEW3D_PT_3dview_properties)
bpy.types.register(VIEW3D_PT_3dview_display)
bpy.types.register(VIEW3D_PT_background_image)
-
-
Modified: branches/itasc/release/ui/space_view3d_toolbar.py
===================================================================
--- branches/itasc/release/ui/space_view3d_toolbar.py 2009-07-25 12:35:14 UTC (rev 21879)
+++ branches/itasc/release/ui/space_view3d_toolbar.py 2009-07-25 12:53:09 UTC (rev 21880)
@@ -17,23 +17,27 @@
layout.itemL(text="Transform:")
- split = layout.split()
- col = split.column(align=True)
+ col = layout.column(align=True)
col.itemO("tfm.translate")
col.itemO("tfm.rotate")
col.itemO("tfm.resize", text="Scale")
layout.itemL(text="Object:")
- split = layout.split()
- col = split.column(align=True)
+ col = layout.column(align=True)
col.itemO("object.duplicate")
col.itemO("object.delete")
+ if context.active_object.type == 'MESH':
+ layout.itemL(text="Shading:")
+
+ col = layout.column(align=True)
+ col.itemO("object.shade_smooth", text="Smooth")
+ col.itemO("object.shade_flat", text="Flat")
+
layout.itemL(text="Keyframes:")
- split = layout.split()
- col = split.column(align=True)
+ col = layout.column(align=True)
col.itemO("anim.insert_keyframe_menu", text="Insert")
col.itemO("anim.delete_keyframe_v3d", text="Remove")
@@ -50,23 +54,23 @@
def draw(self, context):
layout = self.layout
+
layout.itemL(text="Transform:")
- split = layout.split()
- col = split.column(align=True)
+ col = layout.column(align=True)
col.itemO("tfm.translate")
col.itemO("tfm.rotate")
col.itemO("tfm.resize", text="Scale")
layout.itemL(text="Mesh:")
- split = layout.split()
- col = split.column(align=True)
+
+ col = layout.column(align=True)
col.itemO("mesh.duplicate")
col.itemO("mesh.delete")
layout.itemL(text="Modeling:")
- split = layout.split()
- col = split.column(align=True)
+
+ col = layout.column(align=True)
col.itemO("mesh.extrude")
col.itemO("mesh.subdivide")
col.itemO("mesh.spin")
@@ -74,15 +78,13 @@
layout.itemL(text="Shading:")
- split = layout.split()
- col = split.column(align=True)
+ col = layout.column(align=True)
col.itemO("mesh.faces_shade_smooth", text="Smooth")
col.itemO("mesh.faces_shade_flat", text="Flat")
layout.itemL(text="UV Mapping:")
- split = layout.split()
- col = split.column(align=True)
+ col = layout.column(align=True)
col.itemO("uv.mapping_menu", text="Unwrap")
col.itemO("mesh.uvs_rotate")
col.itemO("mesh.uvs_mirror")
@@ -100,25 +102,25 @@
def draw(self, context):
layout = self.layout
+
layout.itemL(text="Transform:")
- split = layout.split()
- col = split.column(align=True)
+ col = layout.column(align=True)
col.itemO("tfm.translate")
col.itemO("tfm.rotate")
col.itemO("tfm.resize", text="Scale")
layout.itemL(text="Curve:")
- split = layout.split()
- col = split.column(align=True)
+
+ col = layout.column(align=True)
col.itemO("curve.duplicate")
col.itemO("curve.delete")
col.itemO("curve.cyclic_toggle")
col.itemO("curve.switch_direction")
layout.itemL(text="Modeling:")
- split = layout.split()
- col = split.column(align=True)
+
+ col = layout.column(align=True)
col.itemO("curve.extrude")
col.itemO("curve.subdivide")
@@ -135,24 +137,25 @@
def draw(self, context):
layout = self.layout
+
layout.itemL(text="Transform:")
- split = layout.split()
- col = split.column(align=True)
+
+ col = layout.column(align=True)
col.itemO("tfm.translate")
col.itemO("tfm.rotate")
col.itemO("tfm.resize", text="Scale")
layout.itemL(text="Curve:")
- split = layout.split()
- col = split.column(align=True)
+
+ col = layout.column(align=True)
col.itemO("curve.duplicate")
col.itemO("curve.delete")
col.itemO("curve.cyclic_toggle")
col.itemO("curve.switch_direction")
layout.itemL(text="Modeling:")
- split = layout.split()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list