[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21250] branches/soc-2009-yukishiro: merge till 21248
Jingyuan Huang
jingyuan.huang at gmail.com
Tue Jun 30 00:54:53 CEST 2009
Revision: 21250
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21250
Author: yukishiro
Date: 2009-06-30 00:54:53 +0200 (Tue, 30 Jun 2009)
Log Message:
-----------
merge till 21248
Modified Paths:
--------------
branches/soc-2009-yukishiro/intern/string/intern/STR_String.cpp
branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/library.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/editors/include/ED_fileselect.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
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_templates.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_utils.c
branches/soc-2009-yukishiro/source/blender/editors/interface/view2d_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/filelist.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/filelist.h
branches/soc-2009-yukishiro/source/blender/editors/space_file/filesel.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/space_file.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_text/space_text.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_access.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_access.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_rna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_api.h
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_types.h
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/Makefile
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Expressions/BoolValue.cpp
branches/soc-2009-yukishiro/source/gameengine/Expressions/IntValue.cpp
branches/soc-2009-yukishiro/source/gameengine/Expressions/ListValue.cpp
branches/soc-2009-yukishiro/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2009-yukishiro/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2009-yukishiro/source/gameengine/Expressions/StringValue.h
branches/soc-2009-yukishiro/source/gameengine/Expressions/Value.cpp
branches/soc-2009-yukishiro/source/gameengine/Expressions/Value.h
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ANDController.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IController.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IObject.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_NANDController.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_NORController.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_ORController.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_XNORController.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_XORController.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_CDActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/VideoTexture/FilterBlueScreen.cpp
branches/soc-2009-yukishiro/source/gameengine/VideoTexture/FilterColor.cpp
branches/soc-2009-yukishiro/source/gameengine/VideoTexture/FilterNormal.cpp
branches/soc-2009-yukishiro/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2009-yukishiro/source/gameengine/VideoTexture/ImageViewport.cpp
branches/soc-2009-yukishiro/source/gameengine/VideoTexture/VideoBase.cpp
branches/soc-2009-yukishiro/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2009-yukishiro/source/gameengine/VideoTexture/blendVideoTex.cpp
Added Paths:
-----------
branches/soc-2009-yukishiro/release/ui/space_filebrowser.py
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_panels.c
Modified: branches/soc-2009-yukishiro/intern/string/intern/STR_String.cpp
===================================================================
--- branches/soc-2009-yukishiro/intern/string/intern/STR_String.cpp 2009-06-29 22:45:21 UTC (rev 21249)
+++ branches/soc-2009-yukishiro/intern/string/intern/STR_String.cpp 2009-06-29 22:54:53 UTC (rev 21250)
@@ -559,7 +559,8 @@
{
int skip;
assertd(pData != NULL);
- for (skip=0; isSpace(pData[skip]); skip++, Len--);
+ for (skip=0; isSpace(pData[skip]); skip++, Len--)
+ {};
memmove(pData, pData+skip, Len+1);
return *this;
}
@@ -598,7 +599,8 @@
{
int skip;
assertd(pData != NULL);
- for (skip=0; Len && strchr(set, pData[skip]); skip++, Len--);
+ for (skip=0; Len && strchr(set, pData[skip]); skip++, Len--)
+ {};
memmove(pData, pData+skip, Len+1);
return *this;
}
Modified: branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-06-29 22:45:21 UTC (rev 21249)
+++ branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-06-29 22:54:53 UTC (rev 21250)
@@ -763,6 +763,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\space_file\file_panels.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_file\filelist.c"
>
</File>
Copied: branches/soc-2009-yukishiro/release/ui/space_filebrowser.py (from rev 21249, branches/blender2.5/blender/release/ui/space_filebrowser.py)
===================================================================
--- branches/soc-2009-yukishiro/release/ui/space_filebrowser.py (rev 0)
+++ branches/soc-2009-yukishiro/release/ui/space_filebrowser.py 2009-06-29 22:54:53 UTC (rev 21250)
@@ -0,0 +1,68 @@
+
+import bpy
+
+
+class FILEBROWSER_HT_header(bpy.types.Header):
+ __space_type__ = "FILE_BROWSER"
+ __idname__ = "FILEBROWSER_HT_header"
+
+ def draw(self, context):
+ st = context.space_data
+ layout = self.layout
+
+ params = st.params
+ layout.template_header(context)
+
+ if context.area.show_menus:
+ row = layout.row()
+ row.itemM("FILEBROWSER_MT_directory")
+ row.itemM("FILEBROWSER_MT_bookmarks")
+
+ row = layout.row(align=True)
+ row.itemO("FILE_OT_parent", text="", icon='ICON_FILE_PARENT')
+ row.itemO("FILE_OT_refresh", text="", icon='ICON_FILE_REFRESH')
+
+ layout.itemR(params, "display", expand=True, text="")
+ layout.itemR(params, "sort", expand=True, text="")
+
+ layout.itemR(params, "hide_dot")
+ layout.itemR(params, "do_filter")
+
+ row = layout.row(align=True)
+ row.itemR(params, "filter_folder", text="");
+ row.itemR(params, "filter_blender", text="");
+ row.itemR(params, "filter_image", text="");
+ row.itemR(params, "filter_movie", text="");
+ row.itemR(params, "filter_script", text="");
+ row.itemR(params, "filter_font", text="");
+ row.itemR(params, "filter_sound", text="");
+ row.itemR(params, "filter_text", text="");
+
+ if params.do_filter:
+ row.active = True
+ else:
+ row.active = False
+
+class FILEBROWSER_MT_directory(bpy.types.Menu):
+ __space_type__ = "FILE_BROWSER"
+ __label__ = "Directory"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.itemO("FILE_OT_refresh", text="Refresh", icon='ICON_FILE_REFRESH')
+ layout.itemO("FILE_OT_parent", text="Parent", icon='ICON_FILE_PARENT')
+
+class FILEBROWSER_MT_bookmarks(bpy.types.Menu):
+ __space_type__ = "FILE_BROWSER"
+ __label__ = "Bookmarks"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.itemO("FILE_OT_add_bookmark", text="Add current directory", icon='ICON_BOOKMARKS')
+
+
+bpy.types.register(FILEBROWSER_HT_header)
+bpy.types.register(FILEBROWSER_MT_directory)
+bpy.types.register(FILEBROWSER_MT_bookmarks)
Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/library.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/library.c 2009-06-29 22:45:21 UTC (rev 21249)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/library.c 2009-06-29 22:54:53 UTC (rev 21250)
@@ -117,6 +117,7 @@
#include "BKE_idprop.h"
#include "BKE_particle.h"
#include "BKE_gpencil.h"
+#include "BKE_lightenv.h"
#define MAX_IDPUP 60 /* was 24 */
Modified: branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c 2009-06-29 22:45:21 UTC (rev 21249)
+++ branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c 2009-06-29 22:54:53 UTC (rev 21250)
@@ -5636,21 +5636,6 @@
/* temporarily hide it */
ar->flag = RGN_FLAG_HIDDEN;
break;
-
- case SPACE_FILE:
- /* channel (bookmarks/directories) region */
- ar= MEM_callocN(sizeof(ARegion), "area region from do_versions");
- BLI_addtail(lb, ar);
- ar->regiontype= RGN_TYPE_CHANNELS;
- ar->alignment= RGN_ALIGN_LEFT;
- ar->v2d.scroll= V2D_SCROLL_RIGHT;
- /* button UI region */
- ar= MEM_callocN(sizeof(ARegion), "area region from do_versions");
- BLI_addtail(lb, ar);
- ar->regiontype= RGN_TYPE_UI;
- ar->alignment= RGN_ALIGN_TOP;
- break;
-
#if 0
case SPACE_BUTS:
/* context UI region */
Modified: branches/soc-2009-yukishiro/source/blender/editors/include/ED_fileselect.h
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/include/ED_fileselect.h 2009-06-29 22:45:21 UTC (rev 21249)
+++ branches/soc-2009-yukishiro/source/blender/editors/include/ED_fileselect.h 2009-06-29 22:54:53 UTC (rev 21250)
@@ -29,35 +29,9 @@
#define ED_FILES_H
struct SpaceFile;
+struct ARegion;
+struct FileSelectParams;
-#define FILE_SHORTDISPLAY 1
-#define FILE_LONGDISPLAY 2
-#define FILE_IMGDISPLAY 3
-
-typedef struct FileSelectParams {
- char title[24]; /* title, also used for the text of the execute button */
- char dir[240]; /* directory */
- char file[80]; /* file */
-
- short flag; /* settings for filter, hiding files and display mode */
- short sort; /* sort order */
- short display; /* display mode flag */
- short filter; /* filter when (flags & FILE_FILTER) is true */
-
- /* XXX - temporary, better move to filelist */
- short active_bookmark;
- int active_file;
- int selstate;
-
- /* XXX --- still unused -- */
- short f_fp; /* show font preview */
- char fp_str[8]; /* string to use for font preview */
-
- char *pupmenu; /* allows menu for save options - result stored in menup */
- short menu; /* currently selected option in pupmenu */
- /* XXX --- end unused -- */
-} FileSelectParams;
-
#define FILE_LAYOUT_HOR 1
#define FILE_LAYOUT_VER 2
@@ -93,7 +67,7 @@
float column_widths[MAX_FILE_COLUMN];
} FileLayout;
-FileSelectParams* ED_fileselect_get_params(struct SpaceFile *sfile);
+struct FileSelectParams* ED_fileselect_get_params(struct SpaceFile *sfile);
short ED_fileselect_set_params(struct SpaceFile *sfile, const char *title, const char *path,
short flag, short display, short filter, short sort);
Modified: branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h 2009-06-29 22:45:21 UTC (rev 21249)
+++ branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h 2009-06-29 22:54:53 UTC (rev 21250)
@@ -456,7 +456,7 @@
/* use inside searchfunc to add items */
int uiSearchItemAdd(uiSearchItems *items, const char *name, void *poin, int iconid);
/* bfunc gets search item *poin as arg2, or if NULL the old string */
-void uiButSetSearchFunc (uiBut *but, uiButSearchFunc sfunc, void *arg1, uiButHandleFunc bfunc);
+void uiButSetSearchFunc (uiBut *but, uiButSearchFunc sfunc, void *arg1, uiButHandleFunc bfunc, void *active);
/* height in pixels, it's using hardcoded values still */
int uiSearchBoxhHeight(void);
Modified: branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c 2009-06-29 22:45:21 UTC (rev 21249)
+++ branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c 2009-06-29 22:54:53 UTC (rev 21250)
@@ -2919,15 +2919,15 @@
}
/* arg is user value, searchfunc and handlefunc both get it as arg */
-void uiButSetSearchFunc(uiBut *but, uiButSearchFunc sfunc, void *arg, uiButHandleFunc bfunc)
+/* if active set, button opens with this item visible and selected */
+void uiButSetSearchFunc(uiBut *but, uiButSearchFunc sfunc, void *arg, uiButHandleFunc bfunc, void *active)
{
but->search_func= sfunc;
but->search_arg= arg;
- uiButSetFunc(but, bfunc, arg, NULL);
+ uiButSetFunc(but, bfunc, arg, active);
}
-
/* Program Init/Exit */
void UI_init(void)
Modified: branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c 2009-06-29 22:45:21 UTC (rev 21249)
+++ branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c 2009-06-29 22:54:53 UTC (rev 21250)
@@ -936,7 +936,7 @@
but->rnasearchprop= searchprop;
but->flag |= UI_ICON_LEFT|UI_TEXT_LEFT;
- uiButSetSearchFunc(but, rna_search_cb, but, NULL);
+ uiButSetSearchFunc(but, rna_search_cb, but, NULL, NULL);
}
}
Modified: branches/soc-2009-yukishiro/source/blender/editors/interface/interface_panel.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/interface/interface_panel.c 2009-06-29 22:45:21 UTC (rev 21249)
+++ branches/soc-2009-yukishiro/source/blender/editors/interface/interface_panel.c 2009-06-29 22:54:53 UTC (rev 21250)
@@ -104,6 +104,8 @@
SpaceButs *sbuts= sa->spacedata.first;
return sbuts->align;
}
+ else if(sa->spacetype==SPACE_FILE && ar->regiontype == RGN_TYPE_CHANNELS)
+ return BUT_VERTICAL;
else if(ELEM(ar->regiontype, RGN_TYPE_UI, RGN_TYPE_TOOLS))
return BUT_VERTICAL;
@@ -126,6 +128,8 @@
}
else if(ar->regiontype==RGN_TYPE_UI)
return 1;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list