[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20215] branches/soc-2009-aligorith: NLA Branch: Merge from 2.5 20116:20214
Joshua Leung
aligorith at gmail.com
Fri May 15 15:35:33 CEST 2009
Revision: 20215
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20215
Author: aligorith
Date: 2009-05-15 15:35:29 +0200 (Fri, 15 May 2009)
Log Message:
-----------
NLA Branch: Merge from 2.5 20116:20214
Modified Paths:
--------------
branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2009-aligorith/release/ui/buttons_data_camera.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_modifier.py
branches/soc-2009-aligorith/release/ui/buttons_objects.py
branches/soc-2009-aligorith/release/ui/buttons_scene.py
branches/soc-2009-aligorith/release/ui/buttons_world.py
branches/soc-2009-aligorith/release/ui/space_text.py
branches/soc-2009-aligorith/source/blender/blenkernel/intern/fcurve.c
branches/soc-2009-aligorith/source/blender/editors/animation/anim_filter.c
branches/soc-2009-aligorith/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2009-aligorith/source/blender/editors/animation/keyframing.c
branches/soc-2009-aligorith/source/blender/editors/armature/editarmature.c
branches/soc-2009-aligorith/source/blender/editors/armature/poselib.c
branches/soc-2009-aligorith/source/blender/editors/curve/curve_ops.c
branches/soc-2009-aligorith/source/blender/editors/curve/editcurve.c
branches/soc-2009-aligorith/source/blender/editors/include/BIF_glutil.h
branches/soc-2009-aligorith/source/blender/editors/include/ED_fileselect.h
branches/soc-2009-aligorith/source/blender/editors/include/ED_screen.h
branches/soc-2009-aligorith/source/blender/editors/include/UI_interface.h
branches/soc-2009-aligorith/source/blender/editors/interface/interface.c
branches/soc-2009-aligorith/source/blender/editors/interface/interface_anim.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_utils.c
branches/soc-2009-aligorith/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-aligorith/source/blender/editors/object/object_edit.c
branches/soc-2009-aligorith/source/blender/editors/physics/editparticle.c
branches/soc-2009-aligorith/source/blender/editors/screen/area.c
branches/soc-2009-aligorith/source/blender/editors/screen/glutil.c
branches/soc-2009-aligorith/source/blender/editors/screen/screen_ops.c
branches/soc-2009-aligorith/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-aligorith/source/blender/editors/space_file/Makefile
branches/soc-2009-aligorith/source/blender/editors/space_file/SConscript
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_intern.h
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_graph/graph_edit.c
branches/soc-2009-aligorith/source/blender/editors/space_image/image_header.c
branches/soc-2009-aligorith/source/blender/editors/space_image/image_ops.c
branches/soc-2009-aligorith/source/blender/editors/space_text/space_text.c
branches/soc-2009-aligorith/source/blender/editors/space_text/text_header.c
branches/soc-2009-aligorith/source/blender/editors/space_text/text_ops.c
branches/soc-2009-aligorith/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-aligorith/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2009-aligorith/source/blender/editors/transform/transform.c
branches/soc-2009-aligorith/source/blender/editors/transform/transform_ops.c
branches/soc-2009-aligorith/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2009-aligorith/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_context.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_curve.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_object.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/python/epy_doc_gen.py
branches/soc-2009-aligorith/source/blender/python/intern/bpy_interface.c
branches/soc-2009-aligorith/source/blender/python/intern/bpy_ui.c
branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_operators.c
Added Paths:
-----------
branches/soc-2009-aligorith/release/ui/buttons_data_empty.py
branches/soc-2009-aligorith/release/ui/buttons_material.py
branches/soc-2009-aligorith/source/blender/editors/interface/interface_templates.c
Removed Paths:
-------------
branches/soc-2009-aligorith/release/windows/extra/python26.zip
Modified: branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-05-15 13:23:03 UTC (rev 20214)
+++ branches/soc-2009-aligorith/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-05-15 13:35:29 UTC (rev 20215)
@@ -44,7 +44,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\ghost\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\blenkey\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\editors\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenfont;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\windowmanager;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
- PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER=1;WITH_QUICKTIME;INTERNATIONAL;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1;WITH_FFMPEG"
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER=1;WITH_QUICKTIME;INTERNATIONAL;WITH_FREETYPE2;WITH_INTERNATIONAL;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1;WITH_FFMPEG"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -119,7 +119,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_9\intern\bsp\include;..\..\..\..\build\msvc_9\intern\ghost\include;..\..\..\..\build\msvc_9\intern\elbeem\include;..\..\..\..\build\msvc_9\intern\opennl\include;..\..\..\..\build\msvc_9\intern\bmfont\include;..\..\..\..\build\msvc_9\intern\blenkey\include;..\..\..\..\build\msvc_9\intern\decimation\include;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\build\msvc_9\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\editors\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenfont;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\nodes;..\..\..\source\blender\windowmanager;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_9\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\source\blender\gpu"
- PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER;WITH_QUICKTIME;INTERNATIONAL;WITH_OPENEXR;WITH_DDS;WITH_BULLET = 1;WITH_FFMPEG"
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER;WITH_QUICKTIME;INTERNATIONAL;WITH_BF_INTERNATIONAL;WITH_FREETYPE2;WITH_OPENEXR;WITH_DDS;WITH_BULLET = 1;WITH_FFMPEG"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
DefaultCharIsUnsigned="true"
Modified: branches/soc-2009-aligorith/release/ui/buttons_data_camera.py
===================================================================
--- branches/soc-2009-aligorith/release/ui/buttons_data_camera.py 2009-05-15 13:23:03 UTC (rev 20214)
+++ branches/soc-2009-aligorith/release/ui/buttons_data_camera.py 2009-05-15 13:35:29 UTC (rev 20215)
@@ -21,30 +21,30 @@
if not cam:
return
- layout.row()
layout.itemR(cam, "type", expand=True)
- layout.row()
- if (cam.type == 'PERSP'):
- layout.itemR(cam, "lens_unit")
- if (cam.lens_unit == 'MILLIMETERS'):
- layout.itemR(cam, "lens", text="Angle")
- if (cam.lens_unit == 'DEGREES'):
- layout.itemR(cam, "angle")
- if (cam.type == 'ORTHO'):
- layout.itemR(cam, "ortho_scale")
+ row = layout.row(align=True)
+ if cam.type == 'PERSP':
+ if cam.lens_unit == 'MILLIMETERS':
+ row.itemR(cam, "lens", text="Angle")
+ elif cam.lens_unit == 'DEGREES':
+ row.itemR(cam, "angle")
+
+ row.itemR(cam, "lens_unit", text="")
+ elif cam.type == 'ORTHO':
+ row.itemR(cam, "ortho_scale")
- layout.column_flow()
- layout.itemL(text="Shift:")
- layout.itemR(cam, "shift_x", text="X")
- layout.itemR(cam, "shift_y", text="Y")
- layout.itemL(text="Clipping:")
- layout.itemR(cam, "clip_start", text="Start")
- layout.itemR(cam, "clip_end", text="End")
+ flow = layout.column_flow()
+ flow.itemL(text="Shift:")
+ flow.itemR(cam, "shift_x", text="X")
+ flow.itemR(cam, "shift_y", text="Y")
+ flow.itemL(text="Clipping:")
+ flow.itemR(cam, "clip_start", text="Start")
+ flow.itemR(cam, "clip_end", text="End")
- layout.row()
- layout.itemR(cam, "dof_object")
- layout.itemR(cam, "dof_distance")
+ row = layout.row()
+ row.itemR(cam, "dof_object")
+ row.itemR(cam, "dof_distance")
class DATA_PT_cameradisplay(DataButtonsPanel):
__idname__ = "DATA_PT_cameradisplay"
@@ -57,23 +57,21 @@
if not cam:
return
- layout.split(number=2)
+ split = layout.split()
- sub = layout.sub(0)
- sub.column()
+ sub = split.column()
sub.itemR(cam, "show_limits", text="Limits")
sub.itemR(cam, "show_mist", text="Mist")
sub.itemR(cam, "show_title_safe", text="Title Safe")
sub.itemR(cam, "show_name", text="Name")
- sub = layout.sub(1)
+ sub = split.column()
subsub = sub.box()
- subsub.column()
subsub.itemR(cam, "show_passepartout", text="Passepartout")
if (cam.show_passepartout):
subsub.itemR(cam, "passepartout_alpha", text="Alpha")
- sub.row()
- sub.itemR(cam, "draw_size", text="Size")
+ row = sub.row()
+ row.itemR(cam, "draw_size", text="Size")
bpy.types.register(DATA_PT_cameralens)
bpy.types.register(DATA_PT_cameradisplay)
Copied: branches/soc-2009-aligorith/release/ui/buttons_data_empty.py (from rev 20214, branches/blender2.5/blender/release/ui/buttons_data_empty.py)
===================================================================
--- branches/soc-2009-aligorith/release/ui/buttons_data_empty.py (rev 0)
+++ branches/soc-2009-aligorith/release/ui/buttons_data_empty.py 2009-05-15 13:35:29 UTC (rev 20215)
@@ -0,0 +1,27 @@
+
+import bpy
+
+class DataButtonsPanel(bpy.types.Panel):
+ __space_type__ = "BUTTONS_WINDOW"
+ __region_type__ = "WINDOW"
+ __context__ = "data"
+
+ def poll(self, context):
+ ob = context.active_object
+ return (ob and ob.type == 'EMPTY')
+
+class DATA_PT_empty(DataButtonsPanel):
+ __idname__ = "DATA_PT_empty"
+ __label__ = "Empty"
+
+ def draw(self, context):
+ ob = context.active_object
+ layout = self.layout
+
+ if not ob:
+ return
+
+ layout.itemR(ob, "empty_draw_type")
+ layout.itemR(ob, "empty_draw_size")
+
+bpy.types.register(DATA_PT_empty)
Modified: branches/soc-2009-aligorith/release/ui/buttons_data_lamp.py
===================================================================
--- branches/soc-2009-aligorith/release/ui/buttons_data_lamp.py 2009-05-15 13:23:03 UTC (rev 20214)
+++ branches/soc-2009-aligorith/release/ui/buttons_data_lamp.py 2009-05-15 13:35:29 UTC (rev 20215)
@@ -21,29 +21,23 @@
if not lamp:
return
- layout.row()
- layout.itemR(lamp, "type", expand=True)
+ row = layout.row()
+ row.itemR(lamp, "type", expand=True)
- layout.split(number=2)
+ split = layout.split()
- sub = layout.sub(0)
- sub.column()
- sub.itemL(text="LAMP DATABLOCKS")
+ sub = split.column()
sub.itemR(lamp, "energy")
sub.itemR(lamp, "distance")
+ sub.itemR(lamp, "negative")
sub.itemR(lamp, "color")
- sub = layout.sub(1)
-
- sub.column()
- sub.itemL(text="Illumination:")
- sub.itemR(lamp, "layer")
- sub.itemR(lamp, "negative")
+ sub = split.column()
+ sub.itemR(lamp, "layer", text="This Layer Only")
sub.itemR(lamp, "specular")
sub.itemR(lamp, "diffuse")
- if (lamp.type in ('LOCAL', 'SPOT')):
- sub.column()
+ if lamp.type in ('POINT', 'SPOT'):
sub.itemR(lamp, "falloff_type")
sub.itemR(lamp, "sphere")
@@ -51,7 +45,7 @@
sub.itemR(lamp, "linear_attenuation")
sub.itemR(lamp, "quadratic_attenuation")
- if (lamp.type == 'AREA'):
+ if lamp.type == 'AREA':
sub.column()
sub.itemR(lamp, "gamma")
sub.itemR(lamp, "shape")
@@ -77,33 +71,31 @@
if not lamp:
return
- layout.row()
- layout.itemR(lamp, "sky")
- layout.itemR(lamp, "atmosphere")
+ row = layout.row()
+ row.itemR(lamp, "sky")
+ row.itemR(lamp, "atmosphere")
- if (lamp.sky or lamp.atmosphere):
- layout.row()
+ if lamp.sky or lamp.atmosphere:
layout.itemR(lamp, "atmosphere_turbidity", text="Turbidity")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list