minor changes, dont append with cmake platform flags which is a string and use enum...
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Sep 2011 15:22:13 +0000 (15:22 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Sep 2011 15:22:13 +0000 (15:22 +0000)
CMakeLists.txt
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_icons.c
source/blender/makesdna/DNA_ID.h

index 3b9e3bd..0d48cba 100644 (file)
@@ -488,17 +488,17 @@ if(UNIX AND NOT APPLE)
                find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_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)
-                       list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB})
+                       set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
                endif()
        endif()
 
        if(CMAKE_SYSTEM_NAME MATCHES "Linux")
                if(NOT WITH_PYTHON_MODULE)
                        # BSD's dont use libdl.so
-                       list(APPEND PLATFORM_LINKLIBS -ldl)
+               set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -ldl")
                        # binreloc is linux only
                        set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
                        set(WITH_BINRELOC ON)
index bcf83f7..878b280 100644 (file)
@@ -2467,7 +2467,7 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str,
        but->pointype= type & BUTPOIN;
        but->bit= type & BIT;
        but->bitnr= type & 31;
-       but->icon = 0;
+       but->icon = ICON_NONE;
        but->iconadd=0;
 
        but->retval= retval;
index fbad342..2443446 100644 (file)
@@ -1018,9 +1018,9 @@ static void ui_id_icon_render(bContext *C, ID *id, int big)
                {
                        /* 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)
-                               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;
                }
@@ -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)
 {
        PreviewImage *pi = BKE_previewimg_get(id); 
-       int i;
+       enum eIconSizes i;
        
        if(!pi)
                return;
index 11c6007..f81a05f 100644 (file)
@@ -125,7 +125,7 @@ typedef struct Library {
 
 enum eIconSizes {
        ICON_SIZE_ICON,
-       ICON_SIZE_PREVIEW,
+       ICON_SIZE_PREVIEW
 };
 #define NUM_ICON_SIZES (ICON_SIZE_PREVIEW + 1)