[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40719] trunk/blender: minor changes, dont append with cmake platform flags which is a string and use enum values rather then ints in a few places .
Campbell Barton
ideasman42 at gmail.com
Fri Sep 30 17:22:13 CEST 2011
Revision: 40719
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40719
Author: campbellbarton
Date: 2011-09-30 15:22:13 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
minor changes, dont append with cmake platform flags which is a string and use enum values rather then ints in a few places.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/makesdna/DNA_ID.h
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-09-30 15:21:10 UTC (rev 40718)
+++ trunk/blender/CMakeLists.txt 2011-09-30 15:22:13 UTC (rev 40719)
@@ -488,17 +488,17 @@
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)
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2011-09-30 15:21:10 UTC (rev 40718)
+++ trunk/blender/source/blender/editors/interface/interface.c 2011-09-30 15:22:13 UTC (rev 40719)
@@ -2467,7 +2467,7 @@
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;
Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c 2011-09-30 15:21:10 UTC (rev 40718)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c 2011-09-30 15:22:13 UTC (rev 40719)
@@ -1018,9 +1018,9 @@
{
/* 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_brush_render(bContext *C, ID *id)
{
PreviewImage *pi = BKE_previewimg_get(id);
- int i;
+ enum eIconSizes i;
if(!pi)
return;
Modified: trunk/blender/source/blender/makesdna/DNA_ID.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_ID.h 2011-09-30 15:21:10 UTC (rev 40718)
+++ trunk/blender/source/blender/makesdna/DNA_ID.h 2011-09-30 15:22:13 UTC (rev 40719)
@@ -125,7 +125,7 @@
enum eIconSizes {
ICON_SIZE_ICON,
- ICON_SIZE_PREVIEW,
+ ICON_SIZE_PREVIEW
};
#define NUM_ICON_SIZES (ICON_SIZE_PREVIEW + 1)
More information about the Bf-blender-cvs
mailing list