Revision: 19992
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19992
Author: yukishiro
Date: 2009-04-30 02:47:50 +0200 (Thu, 30 Apr 2009)
Log Message:
-----------
merge with 2.5 branch
Modified Paths:
--------------
branches/soc-2009-yukishiro/release/datafiles/blenderbuttons
branches/soc-2009-yukishiro/release/datafiles/prvicons
branches/soc-2009-yukishiro/release/ui/buttons_objects.py
branches/soc-2009-yukishiro/release/ui/buttons_scene.py
branches/soc-2009-yukishiro/source/blender/blenfont/BLF_api.h
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal.h
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_lang.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_util.c
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_library.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_screen.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/fcurve.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/library.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/screen.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/text.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframing.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature.c
branches/soc-2009-yukishiro/source/blender/editors/armature/poselib.c
branches/soc-2009-yukishiro/source/blender/editors/curve/curve_ops.c
branches/soc-2009-yukishiro/source/blender/editors/curve/editcurve.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/prvicons.c
branches/soc-2009-yukishiro/source/blender/editors/include/BIF_transform.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_resources.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_anim.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_api.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_draw.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_intern.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_panel.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_regions.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_style.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_utils.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-yukishiro/source/blender/editors/interface/resources.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_edit.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_intern.h
branches/soc-2009-yukishiro/source/blender/editors/object/object_ops.c
branches/soc-2009-yukishiro/source/blender/editors/physics/editparticle.c
branches/soc-2009-yukishiro/source/blender/editors/screen/area.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/space_graph.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/image_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/image_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/space_image.c
branches/soc-2009-yukishiro/source/blender/editors/space_info/info_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_info/space_info.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/space_node.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-yukishiro/source/blender/editors/space_script/script_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_script/script_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_script/script_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/space_text.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_ops.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_orientations.c
branches/soc-2009-yukishiro/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_screen_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_enum_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_context.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_modifier.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_screen.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_text.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_ui.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-yukishiro/source/blender/python/BPY_extern.h
branches/soc-2009-yukishiro/source/blender/python/epy_doc_gen.py
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_interface.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_ui.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_files.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-yukishiro/source/creator/creator.c
branches/soc-2009-yukishiro/source/darwin/Makefile
Added Paths:
-----------
branches/soc-2009-yukishiro/release/ui/buttons_data.py
branches/soc-2009-yukishiro/release/ui/buttons_world.py
branches/soc-2009-yukishiro/release/ui/space_text.py
branches/soc-2009-yukishiro/source/blender/editors/object/object_modifier.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_toolbar.c
Removed Paths:
-------------
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_object.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_scene.c
Modified: branches/soc-2009-yukishiro/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/soc-2009-yukishiro/release/datafiles/prvicons
===================================================================
(Binary files differ)
Copied: branches/soc-2009-yukishiro/release/ui/buttons_data.py (from rev 19953,
branches/blender2.5/blender/release/ui/buttons_data.py)
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_data.py
(rev 0)
+++ branches/soc-2009-yukishiro/release/ui/buttons_data.py 2009-04-30
00:47:50 UTC (rev 19992)
@@ -0,0 +1,56 @@
+
+import bpy
+
+class DataButtonsPanel(bpy.types.Panel):
+ __space_type__ = "BUTTONS_WINDOW"
+ __region_type__ = "WINDOW"
+ __context__ = "data"
+
+class DATA_PT_modifiers(DataButtonsPanel):
+ __idname__ = "DATA_PT_modifiers"
+ __label__ = "Modifiers"
+
+ def draw(self, context):
+ ob = context.active_object
+ layout = self.layout
+
+ if not ob:
+ return
+
+ layout.row()
+ layout.item_menu_enumO("OBJECT_OT_modifier_add", "type")
+
+ for md in ob.modifiers:
+ sub = layout.box()
+
+ sub.row()
+ sub.itemR(md, "expanded", text="")
+ sub.itemR(md, "name", text="")
+
+ sub.itemR(md, "render", text="")
+ sub.itemR(md, "realtime", text="")
+ sub.itemR(md, "editmode", text="")
+ sub.itemR(md, "on_cage", text="")
+
+ if md.expanded:
+ sub.row()
+ sub.itemS()
+
+ if md.type == "ARMATURE":
+ self.armature(sub, md)
+
+ def armature(self, layout, md):
+ layout.column()
+ layout.itemR(md, "object")
+ layout.row()
+ layout.itemR(md, "vertex_group")
+ layout.itemR(md, "invert")
+ layout.column_flow()
+ layout.itemR(md, "use_vertex_groups")
+ layout.itemR(md, "use_bone_envelopes")
+ layout.itemR(md, "quaternion")
+ layout.itemR(md, "b_bone_rest")
+ layout.itemR(md, "multi_modifier")
+
+bpy.types.register(DATA_PT_modifiers)
+
Modified: branches/soc-2009-yukishiro/release/ui/buttons_objects.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_objects.py 2009-04-29
23:59:59 UTC (rev 19991)
+++ branches/soc-2009-yukishiro/release/ui/buttons_objects.py 2009-04-30
00:47:50 UTC (rev 19992)
@@ -6,6 +6,9 @@
__region_type__ = "WINDOW"
__context__ = "object"
+ def poll(self, context):
+ return (context.active_object != None)
+
class OBJECT_PT_transform(ObjectButtonsPanel):
__idname__ = "OBJECT_PT_transform"
__label__ = "Transform"
@@ -14,9 +17,6 @@
ob = context.active_object
layout = self.layout
- if not ob:
- return
-
layout.row()
layout.itemR(ob, "location")
layout.itemR(ob, "rotation")
@@ -30,9 +30,6 @@
ob = context.active_object
layout = self.layout
- if not ob:
- return
-
layout.row()
layout.itemR(ob, "pass_index")
layout.itemR(ob, "parent")
@@ -59,10 +56,7 @@
def draw(self, context):
ob = context.active_object
layout = self.layout
-
- if not ob:
- return
-
+
layout.row()
layout.itemR(ob, "max_draw_type", text="Type")
layout.itemR(ob, "draw_bounds_type", text="Bounds")
@@ -83,18 +77,15 @@
ob = context.active_object
layout = self.layout
- if not ob:
- return
-
layout.column()
layout.itemR(ob, "dupli_type", text="", expand=True)
if ob.dupli_type == "FRAMES":
layout.column_flow()
- layout.itemR(ob, "dupli_frames_start", text="Start:")
- layout.itemR(ob, "dupli_frames_end", text="End:")
- layout.itemR(ob, "dupli_frames_on", text="On:")
- layout.itemR(ob, "dupli_frames_off", text="Off:")
+ layout.itemR(ob, "dupli_frames_start", text="Start")
+ layout.itemR(ob, "dupli_frames_end", text="End")
+ layout.itemR(ob, "dupli_frames_on", text="On")
+ layout.itemR(ob, "dupli_frames_off", text="Off")
class OBJECT_PT_animation(ObjectButtonsPanel):
__idname__ = "OBJECT_PT_animation"
@@ -104,9 +95,6 @@
ob = context.active_object
layout = self.layout
- if not ob:
- return
-
layout.split(number=2)
sub = layout.sub(0)
@@ -116,7 +104,7 @@
sub.itemR(ob, "time_offset_particle", text="Particle")
sub.itemR(ob, "time_offset_parent", text="Parent")
sub.itemR(ob, "slow_parent")
- sub.itemR(ob, "time_offset", text="Offset:")
+ sub.itemR(ob, "time_offset", text="Offset")
sub = layout.sub(1)
sub.column()
Modified: branches/soc-2009-yukishiro/release/ui/buttons_scene.py
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_scene.py 2009-04-29
23:59:59 UTC (rev 19991)
+++ branches/soc-2009-yukishiro/release/ui/buttons_scene.py 2009-04-30
00:47:50 UTC (rev 19992)
@@ -4,7 +4,7 @@
class RenderButtonsPanel(bpy.types.Panel):
__space_type__ = "BUTTONS_WINDOW"
__region_type__ = "WINDOW"
- __context__ = "render"
+ __context__ = "scene"
class RENDER_PT_shading(RenderButtonsPanel):
__label__ = "Shading"
@@ -13,9 +13,6 @@
scene = context.scene
layout = self.layout
- if not scene:
- return
-
rd = scene.render_data
layout.column_flow()
@@ -35,15 +32,11 @@
class RENDER_PT_image(RenderButtonsPanel):
__label__ = "Image"
- __context__ = "render"
def draw(self, context):
scene = context.scene
layout = self.layout
- if not scene:
- return
-
rd = scene.render_data
layout.column_flow()
@@ -54,6 +47,7 @@
layout.row()
layout.itemR(rd, "quality")
+ layout.itemR(rd, "color_mode")
layout.row()
layout.itemR(rd, "placeholders")
@@ -65,15 +59,11 @@
class RENDER_PT_antialiasing(RenderButtonsPanel):
__label__ = "Anti-Aliasing"
- __context__ = "render"
def draw(self, context):
scene = context.scene
layout = self.layout
- if not scene:
- return
-
rd = scene.render_data
layout.row()
@@ -91,15 +81,11 @@
class RENDER_PT_render(RenderButtonsPanel):
__label__ = "Render"
- __context__ = "render"
def draw(self, context):
scene = context.scene
layout = self.layout
- if not scene:
- return
-
rd = scene.render_data
layout.row()
@@ -149,4 +135,4 @@
bpy.types.register(RENDER_PT_render)
bpy.types.register(RENDER_PT_antialiasing)
bpy.types.register(RENDER_PT_shading)
-bpy.types.register(RENDER_PT_image)
\ No newline at end of file
+bpy.types.register(RENDER_PT_image)
Copied: branches/soc-2009-yukishiro/release/ui/buttons_world.py (from rev
19953, branches/blender2.5/blender/release/ui/buttons_world.py)
===================================================================
--- branches/soc-2009-yukishiro/release/ui/buttons_world.py
(rev 0)
+++ branches/soc-2009-yukishiro/release/ui/buttons_world.py 2009-04-30
00:47:50 UTC (rev 19992)
@@ -0,0 +1,130 @@
+
+import bpy
+
+class WorldButtonsPanel(bpy.types.Panel):
+ __space_type__ = "BUTTONS_WINDOW"
+ __region_type__ = "WINDOW"
+ __context__ = "world"
+
+ def poll(self, context):
+ return (context.scene.world != None)
+
+class WORLD_PT_world(WorldButtonsPanel):
+ __label__ = "World"
+
+ def draw(self, context):
+ world = context.scene.world
+ layout = self.layout
+
+ layout.row()
+ layout.itemR(world, "blend_sky")
+ layout.itemR(world, "paper_sky")
+ layout.itemR(world, "real_sky")
+
+ layout.row()
+ layout.itemR(world, "horizon_color")
+ layout.itemR(world, "zenith_color")
+ layout.itemR(world, "ambient_color")
+
+class WORLD_PT_color_correction(WorldButtonsPanel):
+ __label__ = "Color Correction"
+
+ def draw(self, context):
+ world = context.scene.world
+ layout = self.layout
+
+ layout.row()
+ layout.itemR(world, "exposure")
+ layout.itemR(world, "range")
+
+class WORLD_PT_mist(WorldButtonsPanel):
+ __label__ = "Mist"
+
+ def draw(self, context):
+ world = context.scene.world
+ layout = self.layout
+
+ layout.row()
+ layout.itemR(world.mist, "enabled", text="Enable")
+ layout.itemR(world.mist, "falloff")
+
+ layout.column_flow()
+ layout.itemR(world.mist, "start")
+ layout.itemR(world.mist, "depth")
+ layout.itemR(world.mist, "height")
+ layout.itemR(world.mist, "intensity")
+
+class WORLD_PT_stars(WorldButtonsPanel):
+ __label__ = "Stars"
+
+ def draw(self, context):
+ world = context.scene.world
+ layout = self.layout
+
+ layout.row()
+ layout.itemR(world.stars, "enabled", text="Enable")
+
+ layout.column_flow()
+ layout.itemR(world.stars, "size")
+ layout.itemR(world.stars, "min_distance", text="MinDist")
+ layout.itemR(world.stars, "average_separation", text="StarDist")
+ layout.itemR(world.stars, "color_randomization",
text="Colnoise")
+
+class WORLD_PT_ambient_occlusion(WorldButtonsPanel):
+ __label__ = "Ambient Occlusion"
+
+ def draw(self, context):
+ world = context.scene.world
+ layout = self.layout
+
+ ao = world.ambient_occlusion
+
+ layout.row()
+ layout.itemR(ao, "enabled", text="Enable")
+
+ layout.row()
+ layout.itemR(ao, "gather_method", expand=True)
+
+ if ao.gather_method == 'RAYTRACE':
+ layout.row()
+ layout.itemR(ao, "samples")
+ layout.itemR(ao, "distance")
+
+ layout.row()
+ layout.itemR(ao, "sample_method")
+ if ao.sample_method == 'ADAPTIVE_QMC':
+ layout.row()
+ layout.itemR(ao, "threshold")
+ layout.itemR(ao, "adapt_to_speed")
+
+ if ao.sample_method == 'CONSTANT_JITTERED':
+ layout.row()
+ layout.itemR(ao, "bias")
+
+ if ao.gather_method == 'APPROXIMATE':
+ layout.row()
+ layout.itemR(ao, "passes")
+ layout.itemR(ao, "error_tolerance")
+
+ layout.row()
+ layout.itemR(ao, "correction")
+ layout.itemR(ao, "pixel_cache")
+
+ layout.row()
+ layout.itemS()
+
+ layout.row()
+ layout.itemR(ao, "falloff")
+ layout.itemR(ao, "strength")
+
+ layout.column()
+ layout.itemR(ao, "blend_mode", expand=True)
+ layout.itemR(ao, "color", expand=True)
+ layout.itemR(ao, "energy")
+
+bpy.types.register(WORLD_PT_world)
+bpy.types.register(WORLD_PT_mist)
+bpy.types.register(WORLD_PT_stars)
+bpy.types.register(WORLD_PT_ambient_occlusion)
+bpy.types.register(WORLD_PT_color_correction)
+
Copied: branches/soc-2009-yukishiro/release/ui/space_text.py (from rev 19883,
branches/blender2.5/blender/release/ui/space_text.py)
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_text.py
(rev 0)
+++ branches/soc-2009-yukishiro/release/ui/space_text.py 2009-04-30
00:47:50 UTC (rev 19992)
@@ -0,0 +1,145 @@
+
+import bpy
+
+# temporary
+ICON_LINENUMBERS_OFF = 588
+ICON_WORDWRAP_OFF = 584
+ICON_SYNTAX_OFF = 586
+ICON_TEXT = 120
+ICON_HELP = 1
+ICON_SCRIPTPLUGINS = 1
+
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
