sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

minor changes, dont append with cmake platform flags which is a string and use enum values rather then ints in a few places.

Browse Source
This commit is contained in:
Campbell Barton 2011-09-30 15:22:13 +00:00
parent ca2528d551
commit f3ae228c9d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -488,17 +488,17 @@ if(UNIX AND NOT APPLE)
find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH}) find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
mark_as_advanced(X11_XF86keysym_INCLUDE_PATH) mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
list(APPEND PLATFORM_LINKLIBS ${X11_X11_LIB}) set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_X11_LIB}")
if(WITH_X11_XINPUT) if(WITH_X11_XINPUT)
list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB}) set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
endif() endif()
endif() endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux") if(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(NOT WITH_PYTHON_MODULE) if(NOT WITH_PYTHON_MODULE)
# BSD's dont use libdl.so # BSD's dont use libdl.so
list(APPEND PLATFORM_LINKLIBS -ldl) set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -ldl")
# binreloc is linux only # binreloc is linux only
set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include) set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
set(WITH_BINRELOC ON) set(WITH_BINRELOC ON)

2
source/blender/editors/interface/interface.c
View File

@ -2467,7 +2467,7 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str,
but->pointype= type & BUTPOIN; but->pointype= type & BUTPOIN;
but->bit= type & BIT; but->bit= type & BIT;
but->bitnr= type & 31; but->bitnr= type & 31;
but->icon = 0; but->icon = ICON_NONE;
but->iconadd=0; but->iconadd=0;
but->retval= retval; but->retval= retval;

6
source/blender/editors/interface/interface_icons.c
View File

@ -1018,9 +1018,9 @@ static void ui_id_icon_render(bContext *C, ID *id, int big)
{ {
/* create the rect if necessary */ /* create the rect if necessary */
icon_set_image(C, id, pi, 0); /* icon size */ icon_set_image(C, id, pi, ICON_SIZE_ICON); /* icon size */
if (big) if (big)
icon_set_image(C, id, pi, 1); /* bigger preview size */ icon_set_image(C, id, pi, ICON_SIZE_PREVIEW); /* bigger preview size */
pi->changed[0] = 0; pi->changed[0] = 0;
} }
@ -1030,7 +1030,7 @@ static void ui_id_icon_render(bContext *C, ID *id, int big)
static void ui_id_brush_render(bContext *C, ID *id) static void ui_id_brush_render(bContext *C, ID *id)
{ {
PreviewImage *pi = BKE_previewimg_get(id); PreviewImage *pi = BKE_previewimg_get(id);
int i; enum eIconSizes i;
if(!pi) if(!pi)
return; return;

2
source/blender/makesdna/DNA_ID.h
View File

@ -125,7 +125,7 @@ typedef struct Library {
enum eIconSizes { enum eIconSizes {
ICON_SIZE_ICON, ICON_SIZE_ICON,
ICON_SIZE_PREVIEW, ICON_SIZE_PREVIEW
}; };
#define NUM_ICON_SIZES (ICON_SIZE_PREVIEW + 1) #define NUM_ICON_SIZES (ICON_SIZE_PREVIEW + 1)