Revision: 20669
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20669
Author: aligorith
Date: 2009-06-06 07:00:40 +0200 (Sat, 06 Jun 2009)
Log Message:
-----------
NLA SoC: Merge from 2.5
20571 to 20667
Modified Paths:
--------------
branches/soc-2009-aligorith/projectfiles_vc9/blender/blender.sln
branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2009-aligorith/release/ui/buttons_data_armature.py
branches/soc-2009-aligorith/release/ui/buttons_data_bone.py
branches/soc-2009-aligorith/release/ui/buttons_data_camera.py
branches/soc-2009-aligorith/release/ui/buttons_data_curve.py
branches/soc-2009-aligorith/release/ui/buttons_data_empty.py
branches/soc-2009-aligorith/release/ui/buttons_data_lamp.py
branches/soc-2009-aligorith/release/ui/buttons_data_lattice.py
branches/soc-2009-aligorith/release/ui/buttons_data_mesh.py
branches/soc-2009-aligorith/release/ui/buttons_data_modifier.py
branches/soc-2009-aligorith/release/ui/buttons_data_text.py
branches/soc-2009-aligorith/release/ui/buttons_material.py
branches/soc-2009-aligorith/release/ui/buttons_object_constraint.py
branches/soc-2009-aligorith/release/ui/buttons_objects.py
branches/soc-2009-aligorith/release/ui/buttons_particle.py
branches/soc-2009-aligorith/release/ui/buttons_physic_cloth.py
branches/soc-2009-aligorith/release/ui/buttons_scene.py
branches/soc-2009-aligorith/release/ui/buttons_texture.py
branches/soc-2009-aligorith/release/ui/buttons_world.py
branches/soc-2009-aligorith/source/blender/blenkernel/BKE_particle.h
branches/soc-2009-aligorith/source/blender/blenkernel/intern/modifier.c
branches/soc-2009-aligorith/source/blender/blenkernel/intern/node.c
branches/soc-2009-aligorith/source/blender/blenkernel/intern/particle.c
branches/soc-2009-aligorith/source/blender/blenkernel/intern/particle_system.c
branches/soc-2009-aligorith/source/blender/blenkernel/intern/pointcache.c
branches/soc-2009-aligorith/source/blender/blenloader/intern/readfile.c
branches/soc-2009-aligorith/source/blender/editors/include/ED_fileselect.h
branches/soc-2009-aligorith/source/blender/editors/include/ED_object.h
branches/soc-2009-aligorith/source/blender/editors/include/UI_interface.h
branches/soc-2009-aligorith/source/blender/editors/include/UI_resources.h
branches/soc-2009-aligorith/source/blender/editors/interface/interface.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_api.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_intern.h
branches/soc-2009-aligorith/source/blender/editors/interface/interface_layout.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_panel.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_regions.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_style.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_templates.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_utils.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-aligorith/source/blender/editors/object/editconstraint.c
branches/soc-2009-aligorith/source/blender/editors/object/object_intern.h
branches/soc-2009-aligorith/source/blender/editors/object/object_modifier.c
branches/soc-2009-aligorith/source/blender/editors/object/object_ops.c
branches/soc-2009-aligorith/source/blender/editors/physics/editparticle.c
branches/soc-2009-aligorith/source/blender/editors/preview/previewrender.c
branches/soc-2009-aligorith/source/blender/editors/screen/area.c
branches/soc-2009-aligorith/source/blender/editors/screen/screen_ops.c
branches/soc-2009-aligorith/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2009-aligorith/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2009-aligorith/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-aligorith/source/blender/editors/space_file/file_draw.c
branches/soc-2009-aligorith/source/blender/editors/space_file/file_header.c
branches/soc-2009-aligorith/source/blender/editors/space_file/file_ops.c
branches/soc-2009-aligorith/source/blender/editors/space_file/filelist.c
branches/soc-2009-aligorith/source/blender/editors/space_file/filelist.h
branches/soc-2009-aligorith/source/blender/editors/space_file/filesel.c
branches/soc-2009-aligorith/source/blender/editors/space_file/space_file.c
branches/soc-2009-aligorith/source/blender/editors/space_info/info_header.c
branches/soc-2009-aligorith/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-aligorith/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2009-aligorith/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-aligorith/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-aligorith/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2009-aligorith/source/blender/makesdna/DNA_particle_types.h
branches/soc-2009-aligorith/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-aligorith/source/blender/makesrna/RNA_access.h
branches/soc-2009-aligorith/source/blender/makesrna/RNA_define.h
branches/soc-2009-aligorith/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_ID.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_action.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_armature.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_brush.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_camera.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_curve.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_group.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_image.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_key.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_main.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_meta.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_rna.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_screen.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_scriptlink.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_sound.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_text.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_texture.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_ui.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_vfont.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_wm.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-aligorith/source/blender/python/intern/bpy_interface.c
branches/soc-2009-aligorith/source/blender/python/intern/bpy_operator.c
branches/soc-2009-aligorith/source/blender/python/intern/bpy_operator.h
branches/soc-2009-aligorith/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2009-aligorith/source/blender/python/intern/bpy_rna.c
branches/soc-2009-aligorith/source/blender/python/intern/bpy_rna.h
branches/soc-2009-aligorith/source/blender/python/intern/bpy_ui.c
branches/soc-2009-aligorith/source/blender/render/intern/source/convertblender.c
branches/soc-2009-aligorith/source/blender/windowmanager/WM_types.h
branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-aligorith/source/blender/windowmanager/wm_event_types.h
Added Paths:
-----------
branches/soc-2009-aligorith/source/blender/editors/space_buttons/buttons_context.c
Modified: branches/soc-2009-aligorith/projectfiles_vc9/blender/blender.sln
===================================================================
--- branches/soc-2009-aligorith/projectfiles_vc9/blender/blender.sln
2009-06-06 04:56:22 UTC (rev 20668)
+++ branches/soc-2009-aligorith/projectfiles_vc9/blender/blender.sln
2009-06-06 05:00:40 UTC (rev 20669)
@@ -39,7 +39,6 @@
{BAC615B0-F1AF-418B-8D23-A10FD8870D6A} =
{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}
{E90C7BC2-CF30-4A60-A8F2-0050D592E358} =
{E90C7BC2-CF30-4A60-A8F2-0050D592E358}
{8B8D4FC3-3234-4E54-8376-5AB83D00D164} =
{8B8D4FC3-3234-4E54-8376-5AB83D00D164}
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879} =
{9991A3C3-83FE-4AFE-9E18-9D01CB57E879}
{4B6AFCC5-968C-424A-8F20-76E41B3BEF74} =
{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}
{0112CAD5-3584-412A-A2E5-1315A00437B4} =
{0112CAD5-3584-412A-A2E5-1315A00437B4}
{EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9} =
{EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}
@@ -210,8 +209,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PHY_Sumo",
"..\gameengine\physics\PHY_Physics\PHY_Sumo\PHY_Sumo.vcproj",
"{9625642D-6F20-4FB6-A089-BE7441B223E3}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BRE_yafray",
"yafray\BRE_yafray.vcproj", "{9991A3C3-83FE-4AFE-9E18-9D01CB57E879}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PHY_Bullet",
"..\gameengine\physics\PHY_Physics\PHY_Bullet\PHY_Bullet.vcproj",
"{E90C7BC2-CF30-4A60-A8F2-0050D592E358}"
ProjectSection(ProjectDependencies) = postProject
{FFD3C64A-30E2-4BC7-BC8F-51818C320400} =
{FFD3C64A-30E2-4BC7-BC8F-51818C320400}
@@ -831,20 +828,6 @@
{9625642D-6F20-4FB6-A089-BE7441B223E3}.Debug|Win32.Build.0 = 3D
Plugin Debug|Win32
{9625642D-6F20-4FB6-A089-BE7441B223E3}.Release|Win32.ActiveCfg
= BlenderPlayer Release|Win32
{9625642D-6F20-4FB6-A089-BE7441B223E3}.Release|Win32.Build.0 =
BlenderPlayer Release|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.3D Plugin
Debug|Win32.ActiveCfg = Blender Release|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.3D Plugin
Debug|Win32.Build.0 = Blender Release|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.3D Plugin
Release|Win32.ActiveCfg = Blender Release|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.3D Plugin
Release|Win32.Build.0 = Blender Release|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.Blender
Debug|Win32.ActiveCfg = Blender Debug|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.Blender
Debug|Win32.Build.0 = Blender Debug|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.Blender
Release|Win32.ActiveCfg = Blender Release|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.Blender
Release|Win32.Build.0 = Blender Release|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.BlenderPlayer
Debug|Win32.ActiveCfg = Blender Debug|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.BlenderPlayer
Release|Win32.ActiveCfg = Blender Release|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.Debug|Win32.ActiveCfg =
Blender Debug|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.Debug|Win32.Build.0 =
Blender Debug|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.Release|Win32.ActiveCfg
= Blender Release|Win32
- {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}.Release|Win32.Build.0 =
Blender Release|Win32
{E90C7BC2-CF30-4A60-A8F2-0050D592E358}.3D Plugin
Debug|Win32.ActiveCfg = 3D Plugin Debug|Win32
{E90C7BC2-CF30-4A60-A8F2-0050D592E358}.3D Plugin
Debug|Win32.Build.0 = 3D Plugin Debug|Win32
{E90C7BC2-CF30-4A60-A8F2-0050D592E358}.3D Plugin
Release|Win32.ActiveCfg = 3D Plugin Release|Win32
Modified:
branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
---
branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-06-06 04:56:22 UTC (rev 20668)
+++
branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-06-06 05:00:40 UTC (rev 20669)
@@ -715,6 +715,10 @@
Name="space_buttons"
>
<File
+
RelativePath="..\..\..\source\blender\editors\space_buttons\buttons_context.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_buttons\buttons_header.c"
>
</File>
Modified: branches/soc-2009-aligorith/release/ui/buttons_data_armature.py
===================================================================
--- branches/soc-2009-aligorith/release/ui/buttons_data_armature.py
2009-06-06 04:56:22 UTC (rev 20668)
+++ branches/soc-2009-aligorith/release/ui/buttons_data_armature.py
2009-06-06 05:00:40 UTC (rev 20669)
@@ -7,15 +7,14 @@
__context__ = "data"
def poll(self, context):
- ob = context.active_object
- return (ob and ob.type == 'ARMATURE')
+ return (context.armature != None)
class DATA_PT_skeleton(DataButtonsPanel):
__idname__ = "DATA_PT_skeleton"
__label__ = "Skeleton"
def draw(self, context):
- arm = context.active_object.data
+ arm = context.armature
layout = self.layout
layout.itemR(arm, "rest_position")
@@ -42,7 +41,7 @@
__label__ = "Display"
def draw(self, context):
- arm = context.active_object.data
+ arm = context.armature
layout = self.layout
split = layout.split()
@@ -62,7 +61,7 @@
__label__ = "Paths"
def draw(self, context):
- arm = context.active_object.data
+ arm = context.armature
layout = self.layout
split = layout.split()
@@ -90,7 +89,7 @@
__label__ = "Ghost"
def draw(self, context):
- arm = context.active_object.data
+ arm = context.armature
layout = self.layout
split = layout.split()
@@ -111,4 +110,4 @@
bpy.types.register(DATA_PT_skeleton)
bpy.types.register(DATA_PT_display)
bpy.types.register(DATA_PT_paths)
-bpy.types.register(DATA_PT_ghost)
\ No newline at end of file
+bpy.types.register(DATA_PT_ghost)
Modified: branches/soc-2009-aligorith/release/ui/buttons_data_bone.py
===================================================================
--- branches/soc-2009-aligorith/release/ui/buttons_data_bone.py 2009-06-06
04:56:22 UTC (rev 20668)
+++ branches/soc-2009-aligorith/release/ui/buttons_data_bone.py 2009-06-06
05:00:40 UTC (rev 20669)
@@ -7,15 +7,14 @@
__context__ = "bone"
def poll(self, context):
- ob = context.active_object
- return (ob and ob.type == 'ARMATURE')
+ return (context.bone != None)
class BONE_PT_bone(BoneButtonsPanel):
__idname__ = "BONE_PT_bone"
__label__ = "Bone"
def draw(self, context):
- bone = context.active_object.data.bones[0]
+ bone = context.bone
layout = self.layout
split = layout.split()
Modified: branches/soc-2009-aligorith/release/ui/buttons_data_camera.py
===================================================================
--- branches/soc-2009-aligorith/release/ui/buttons_data_camera.py
2009-06-06 04:56:22 UTC (rev 20668)
+++ branches/soc-2009-aligorith/release/ui/buttons_data_camera.py
2009-06-06 05:00:40 UTC (rev 20669)
@@ -7,15 +7,14 @@
__context__ = "data"
def poll(self, context):
- ob = context.active_object
- return (ob and ob.type == 'CAMERA')
+ return (context.camera != None)
class DATA_PT_cameralens(DataButtonsPanel):
__idname__ = "DATA_PT_camera"
__label__ = "Lens"
def draw(self, context):
- cam = context.active_object.data
+ cam = context.camera
layout = self.layout
layout.itemR(cam, "type", expand=True)
@@ -52,7 +51,7 @@
__label__ = "Display"
def draw(self, context):
- cam = context.active_object.data
+ cam = context.camera
layout = self.layout
split = layout.split()
@@ -71,4 +70,4 @@
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
+bpy.types.register(DATA_PT_cameradisplay)
Modified: branches/soc-2009-aligorith/release/ui/buttons_data_curve.py
===================================================================
--- branches/soc-2009-aligorith/release/ui/buttons_data_curve.py
2009-06-06 04:56:22 UTC (rev 20668)
+++ branches/soc-2009-aligorith/release/ui/buttons_data_curve.py
2009-06-06 05:00:40 UTC (rev 20669)
@@ -7,15 +7,15 @@
__context__ = "data"
def poll(self, context):
- ob = context.active_object
- return (ob and ob.type == 'CURVE')
+ ob = context.object
+ return (ob and ob.type == 'CURVE' and context.curve)
class DATA_PT_shape_curve(DataButtonsPanel):
__idname__ = "DATA_PT_shape_curve"
__label__ = "Shape"
def draw(self, context):
- curve = context.active_object.data
+ curve = context.curve
layout = self.layout
layout.itemR(curve, "curve_2d")
@@ -50,7 +50,7 @@
__label__ = "Geometry"
def draw(self, context):
- curve = context.active_object.data
+ curve = context.curve
layout = self.layout
split = layout.split()
@@ -72,13 +72,13 @@
__label__ = "Path Animation"
def draw_header(self, context):
- curve = context.active_object.data
+ curve = context.curve
layout = self.layout
layout.itemR(curve, "path", text="")
def draw(self, context):
- curve = context.active_object.data
+ curve = context.curve
layout = self.layout
layout.active = curve.path
@@ -97,7 +97,7 @@
__label__ = "Current Curve"
def draw(self, context):
- currentcurve = context.active_object.data.curves[0]
+ currentcurve = context.curve.curves[0] # XXX
layout = self.layout
split = layout.split()
@@ -128,4 +128,4 @@
bpy.types.register(DATA_PT_shape_curve)
bpy.types.register(DATA_PT_geometry)
bpy.types.register(DATA_PT_pathanim)
-bpy.types.register(DATA_PT_current_curve)
\ No newline at end of file
+bpy.types.register(DATA_PT_current_curve)
Modified: branches/soc-2009-aligorith/release/ui/buttons_data_empty.py
===================================================================
--- branches/soc-2009-aligorith/release/ui/buttons_data_empty.py
2009-06-06 04:56:22 UTC (rev 20668)
+++ branches/soc-2009-aligorith/release/ui/buttons_data_empty.py
2009-06-06 05:00:40 UTC (rev 20669)
@@ -7,7 +7,7 @@
__context__ = "data"
def poll(self, context):
- ob = context.active_object
+ ob = context.object
return (ob and ob.type == 'EMPTY')
class DATA_PT_empty(DataButtonsPanel):
@@ -15,10 +15,10 @@
__label__ = "Empty"
def draw(self, context):
- ob = context.active_object
+ ob = context.object
layout = self.layout
layout.itemR(ob, "empty_draw_type")
layout.itemR(ob, "empty_draw_size")
-bpy.types.register(DATA_PT_empty)
\ No newline at end of file
+bpy.types.register(DATA_PT_empty)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
