[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50338] trunk/blender/source/blender: code cleanup: split out defines in BKE_utildefines.h into BLO_blend_defs. h and ui defines in interface_intern.h
Campbell Barton
ideasman42 at gmail.com
Mon Sep 3 12:12:26 CEST 2012
Revision: 50338
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50338
Author: campbellbarton
Date: 2012-09-03 10:12:25 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
code cleanup: split out defines in BKE_utildefines.h into BLO_blend_defs.h and ui defines in interface_intern.h
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_utildefines.h
trunk/blender/source/blender/blenlib/BLI_fileops.h
trunk/blender/source/blender/blenloader/CMakeLists.txt
trunk/blender/source/blender/blenloader/intern/readblenentry.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/imbuf/intern/thumbs_blend.c
Added Paths:
-----------
trunk/blender/source/blender/blenloader/BLO_blend_defs.h
Modified: trunk/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_utildefines.h 2012-09-03 10:08:55 UTC (rev 50337)
+++ trunk/blender/source/blender/blenkernel/BKE_utildefines.h 2012-09-03 10:12:25 UTC (rev 50338)
@@ -47,41 +47,6 @@
#define FILE_MAX 1024
#endif
-/* this weirdo pops up in two places ... */
-#if !defined(WIN32)
-# ifndef O_BINARY
-# define O_BINARY 0
-# endif
-#endif
-
-/* INTEGER CODES */
-#ifdef __BIG_ENDIAN__
-/* Big Endian */
-# define MAKE_ID(a, b, c, d) ( (int)(a) << 24 | (int)(b) << 16 | (c) << 8 | (d) )
-#else
-/* Little Endian */
-# define MAKE_ID(a, b, c, d) ( (int)(d) << 24 | (int)(c) << 16 | (b) << 8 | (a) )
-#endif
-
-#define DATA MAKE_ID('D', 'A', 'T', 'A')
-#define GLOB MAKE_ID('G', 'L', 'O', 'B')
-
-#define DNA1 MAKE_ID('D', 'N', 'A', '1')
-#define TEST MAKE_ID('T', 'E', 'S', 'T') /* used as preview between 'REND' and 'GLOB' */
-#define REND MAKE_ID('R', 'E', 'N', 'D')
-#define USER MAKE_ID('U', 'S', 'E', 'R')
-
-#define ENDB MAKE_ID('E', 'N', 'D', 'B')
-
-/* Bit operations */
-#define BTST(a, b) ( ( (a) & 1 << (b) ) != 0)
-#define BNTST(a, b) ( ( (a) & 1 << (b) ) == 0)
-#define BTST2(a, b, c) (BTST( (a), (b) ) || BTST( (a), (c) ) )
-#define BSET(a, b) ( (a) | 1 << (b) )
-#define BCLR(a, b) ( (a) & ~(1 << (b)) )
-/* bit-row */
-#define BROW(min, max) (((max) >= 31 ? 0xFFFFFFFF : (1 << (max + 1)) - 1) - ((min) ? ((1 << (min)) - 1) : 0) )
-
#ifdef __cplusplus
}
#endif
Modified: trunk/blender/source/blender/blenlib/BLI_fileops.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_fileops.h 2012-09-03 10:08:55 UTC (rev 50337)
+++ trunk/blender/source/blender/blenlib/BLI_fileops.h 2012-09-03 10:12:25 UTC (rev 50338)
@@ -91,6 +91,13 @@
struct LinkNode *BLI_file_read_as_lines(const char *file);
void BLI_file_free_lines(struct LinkNode *lines);
+/* this weirdo pops up in two places ... */
+#if !defined(WIN32)
+# ifndef O_BINARY
+# define O_BINARY 0
+# endif
+#endif
+
#ifdef __cplusplus
}
#endif
Added: trunk/blender/source/blender/blenloader/BLO_blend_defs.h
===================================================================
--- trunk/blender/source/blender/blenloader/BLO_blend_defs.h (rev 0)
+++ trunk/blender/source/blender/blenloader/BLO_blend_defs.h 2012-09-03 10:12:25 UTC (rev 50338)
@@ -0,0 +1,47 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef __BLO_BLEND_DEFS_H__
+#define __BLO_BLEND_DEFS_H__
+
+/** \file BLO_blend_defs.h
+ * \ingroup blenloader
+ * \brief defines for blendfile codes
+ */
+
+/* INTEGER CODES */
+#ifdef __BIG_ENDIAN__
+/* Big Endian */
+# define BLEND_MAKE_ID(a, b, c, d) ( (int)(a) << 24 | (int)(b) << 16 | (c) << 8 | (d) )
+#else
+/* Little Endian */
+# define BLEND_MAKE_ID(a, b, c, d) ( (int)(d) << 24 | (int)(c) << 16 | (b) << 8 | (a) )
+#endif
+
+#define DATA BLEND_MAKE_ID('D', 'A', 'T', 'A')
+#define GLOB BLEND_MAKE_ID('G', 'L', 'O', 'B')
+
+#define DNA1 BLEND_MAKE_ID('D', 'N', 'A', '1')
+#define TEST BLEND_MAKE_ID('T', 'E', 'S', 'T') /* used as preview between 'REND' and 'GLOB' */
+#define REND BLEND_MAKE_ID('R', 'E', 'N', 'D')
+#define USER BLEND_MAKE_ID('U', 'S', 'E', 'R')
+
+#define ENDB BLEND_MAKE_ID('E', 'N', 'D', 'B')
+
+#endif /* __BLO_BLEND_DEFS_H__ */
Property changes on: trunk/blender/source/blender/blenloader/BLO_blend_defs.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/blender/source/blender/blenloader/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenloader/CMakeLists.txt 2012-09-03 10:08:55 UTC (rev 50337)
+++ trunk/blender/source/blender/blenloader/CMakeLists.txt 2012-09-03 10:12:25 UTC (rev 50338)
@@ -48,6 +48,7 @@
intern/versioning_legacy.c
intern/writefile.c
+ BLO_blend_defs.h
BLO_readfile.h
BLO_runtime.h
BLO_soundfile.h
Modified: trunk/blender/source/blender/blenloader/intern/readblenentry.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readblenentry.c 2012-09-03 10:08:55 UTC (rev 50337)
+++ trunk/blender/source/blender/blenloader/intern/readblenentry.c 2012-09-03 10:12:25 UTC (rev 50338)
@@ -59,6 +59,7 @@
#include "BLO_readfile.h"
#include "BLO_undofile.h"
+#include "BLO_blend_defs.h"
#include "readfile.h"
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-09-03 10:08:55 UTC (rev 50337)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-09-03 10:12:25 UTC (rev 50338)
@@ -150,6 +150,7 @@
#include "BLO_readfile.h"
#include "BLO_undofile.h"
+#include "BLO_blend_defs.h"
#include "RE_engine.h"
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2012-09-03 10:08:55 UTC (rev 50337)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2012-09-03 10:12:25 UTC (rev 50338)
@@ -163,6 +163,7 @@
#include "BLO_writefile.h"
#include "BLO_readfile.h"
#include "BLO_undofile.h"
+#include "BLO_blend_defs.h"
#include "readfile.h"
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2012-09-03 10:08:55 UTC (rev 50337)
+++ trunk/blender/source/blender/editors/interface/interface.c 2012-09-03 10:12:25 UTC (rev 50338)
@@ -1077,8 +1077,12 @@
int lvalue;
UI_GET_BUT_VALUE_INIT(but, *value);
lvalue = (int)*value;
- if (BTST(lvalue, (but->bitnr)) ) is_push = is_true;
- else is_push = !is_true;
+ if (UI_BITBUT_TEST(lvalue, (but->bitnr))) {
+ is_push = is_true;
+ }
+ else {
+ is_push = !is_true;
+ }
}
else {
switch (but->type) {
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-09-03 10:08:55 UTC (rev 50337)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-09-03 10:12:25 UTC (rev 50338)
@@ -501,9 +501,9 @@
lvalue = (int)value;
if (but->bit) {
- w = BTST(lvalue, but->bitnr);
- if (w) lvalue = BCLR(lvalue, but->bitnr);
- else lvalue = BSET(lvalue, but->bitnr);
+ w = UI_BITBUT_TEST(lvalue, but->bitnr);
+ if (w) lvalue = UI_BITBUT_CLR(lvalue, but->bitnr);
+ else lvalue = UI_BITBUT_SET(lvalue, but->bitnr);
if (but->type == TOGR) {
if (!data->togonly) {
@@ -605,27 +605,27 @@
if (but->pointype == SHO) {
short *sp = (short *)but->poin;
- if (BTST(sp[1], but->bitnr)) {
- sp[1] = BCLR(sp[1], but->bitnr);
- sp[0] = BCLR(sp[0], but->bitnr);
+ if (UI_BITBUT_TEST(sp[1], but->bitnr)) {
+ sp[1] = UI_BITBUT_CLR(sp[1], but->bitnr);
+ sp[0] = UI_BITBUT_CLR(sp[0], but->bitnr);
}
- else if (BTST(sp[0], but->bitnr)) {
- sp[1] = BSET(sp[1], but->bitnr);
+ else if (UI_BITBUT_TEST(sp[0], but->bitnr)) {
+ sp[1] = UI_BITBUT_SET(sp[1], but->bitnr);
}
else {
- sp[0] = BSET(sp[0], but->bitnr);
+ sp[0] = UI_BITBUT_SET(sp[0], but->bitnr);
}
}
else {
- if (BTST(*(but->poin + 2), but->bitnr)) {
- *(but->poin + 2) = BCLR(*(but->poin + 2), but->bitnr);
- *(but->poin) = BCLR(*(but->poin), but->bitnr);
+ if (UI_BITBUT_TEST(*(but->poin + 2), but->bitnr)) {
+ *(but->poin + 2) = UI_BITBUT_CLR(*(but->poin + 2), but->bitnr);
+ *(but->poin) = UI_BITBUT_CLR(*(but->poin), but->bitnr);
}
- else if (BTST(*(but->poin), but->bitnr)) {
- *(but->poin + 2) = BSET(*(but->poin + 2), but->bitnr);
+ else if (UI_BITBUT_TEST(*(but->poin), but->bitnr)) {
+ *(but->poin + 2) = UI_BITBUT_SET(*(but->poin + 2), but->bitnr);
}
else {
- *(but->poin) = BSET(*(but->poin), but->bitnr);
+ *(but->poin) = UI_BITBUT_SET(*(but->poin), but->bitnr);
}
}
Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_intern.h 2012-09-03 10:08:55 UTC (rev 50337)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h 2012-09-03 10:12:25 UTC (rev 50338)
@@ -131,6 +131,14 @@
/* for scope resize zone */
#define SCOPE_RESIZE_PAD 9
+/* bit button defines */
+/* Bit operations */
+#define UI_BITBUT_TEST(a, b) ( ( (a) & 1 << (b) ) != 0)
+#define UI_BITBUT_SET(a, b) ( (a) | 1 << (b) )
+#define UI_BITBUT_CLR(a, b) ( (a) & ~(1 << (b)) )
+/* bit-row */
+#define UI_BITBUT_ROW(min, max) (((max) >= 31 ? 0xFFFFFFFF : (1 << (max + 1)) - 1) - ((min) ? ((1 << (min)) - 1) : 0) )
+
typedef struct uiLinkLine { /* only for draw/edit */
struct uiLinkLine *next, *prev;
struct uiBut *from, *to;
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c 2012-09-03 10:08:55 UTC (rev 50337)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c 2012-09-03 10:12:25 UTC (rev 50338)
@@ -1257,9 +1257,9 @@
if (but->type == BUT_TOGDUAL) {
int dualset = 0;
if (but->pointype == SHO)
- dualset = BTST(*(((short *)but->poin) + 1), but->bitnr);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list