archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5

Browse Source 
- Ported over view3d header buttons.
  Most of the options don't work :) but some do!
- Fixed makefiles for new animation module
- added icon definitions in resources to match current trunk.
This commit is contained in:
Ton Roosendaal
2008-12-20 12:36:14 +00:00
parent 95e458fd03
commit 851f437361
5 changed files with 5909 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/Makefile
View File

@@ -251,6 +251,7 @@ PULIB += $(OCGDIR)/blender/ed_outliner/libed_outliner.a
PULIB += $(OCGDIR)/blender/ed_time/libed_time.a PULIB += $(OCGDIR)/blender/ed_time/libed_time.a
PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a
PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a
PULIB += $(OCGDIR)/blender/ed_animation/libed_animation.a
PULIB += $(OCGDIR)/blender/ed_util/libed_util.a PULIB += $(OCGDIR)/blender/ed_util/libed_util.a
PULIB += $(OCGDIR)/blender/ed_datafiles/libed_datafiles.a PULIB += $(OCGDIR)/blender/ed_datafiles/libed_datafiles.a
PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a

2
source/blender/editors/Makefile
View File

@@ -29,6 +29,6 @@
# Bounces make to subdirectories. # Bounces make to subdirectories.
SOURCEDIR = source/blender/editors SOURCEDIR = source/blender/editors
DIRS = datafiles screen space_outliner space_time space_view3d interface util space_api space_ipo space_image space_node space_buttons space_info space_file space_sound space_action space_nla space_script space_text space_sequencer DIRS = animation datafiles screen space_outliner space_time space_view3d interface util space_api space_ipo space_image space_node space_buttons space_info space_file space_sound space_action space_nla space_script space_text space_sequencer
include nan_subdirs.mk include nan_subdirs.mk

14
source/blender/editors/include/UI_resources.h
View File

@@ -84,10 +84,10 @@ typedef enum {
ICON_SHORTDISPLAY, ICON_SHORTDISPLAY,
ICON_TRIA_DOWN, ICON_TRIA_DOWN,
ICON_TRIA_RIGHT, ICON_TRIA_RIGHT,
ICON_BLANK7, ICON_NDOF_TURN,
ICON_BLANK8, ICON_NDOF_FLY,
ICON_BLANK9, ICON_NDOF_TRANS,
ICON_BLANK10, ICON_NDOF_DOM,
ICON_VIEW_AXIS_ALL, ICON_VIEW_AXIS_ALL,
ICON_VIEW_AXIS_NONE, ICON_VIEW_AXIS_NONE,
@@ -269,8 +269,8 @@ typedef enum {
ICON_WINDOW_WINDOW, ICON_WINDOW_WINDOW,
ICON_PANEL_CLOSE, ICON_PANEL_CLOSE,
ICON_PHYSICS, ICON_PHYSICS,
ICON_BLANK36, ICON_LAYER_USED,
ICON_BLANK37, ICON_LAYER_ACTIVE,
ICON_BLANK38, ICON_BLANK38,
ICON_BLENDER, ICON_BLENDER,
@@ -296,7 +296,7 @@ typedef enum {
ICON_ARMATURE_DEHLT, ICON_ARMATURE_DEHLT,
ICON_SNAP_GEAR, ICON_SNAP_GEAR,
ICON_SNAP_GEO, ICON_SNAP_GEO,
ICON_BLANK41, ICON_SNAP_NORMAL,
ICON_BLANK42, ICON_BLANK42,
ICON_SMOOTHCURVE, ICON_SMOOTHCURVE,

5916
source/blender/editors/space_view3d/view3d_header.c
View File

File diff suppressed because it is too large Load Diff

2
source/blender/windowmanager/intern/wm_init_exit.c
View File

@@ -141,6 +141,8 @@ void WM_init(bContext *C)
GPU_extensions_init(); GPU_extensions_init();
G.ndofdevice = -1; /* XXX bad initializer, needs set otherwise buttons show! */
read_Blog(); read_Blog();
BLI_strncpy(G.lib, G.sce, FILE_MAX); BLI_strncpy(G.lib, G.sce, FILE_MAX);
} }