Revision: 16375
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16375
Author: aligorith
Date: 2008-09-05 08:05:25 +0200 (Fri, 05 Sep 2008)
Log Message:
-----------
Compiling/Warning Fixes (for scons/mingw + "split sources hack") Part 1:
* Removed compiler warnings from texteditor work
* Added round brackets around the new defines for IPO channels for extra
texture layers
* Tweaked priorities so that BLI_heap_* functions in blenlib can be found by
linker (split-sources specific)
TODO:
* "monkey*" vars cannot be found still
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/suggestions.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenlib/SConscript
trunk/blender/source/blender/makesdna/DNA_ipo_types.h
trunk/blender/source/blender/src/keyval.c
Modified: trunk/blender/source/blender/blenkernel/intern/suggestions.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/suggestions.c
2008-09-05 05:17:26 UTC (rev 16374)
+++ trunk/blender/source/blender/blenkernel/intern/suggestions.c
2008-09-05 06:05:25 UTC (rev 16375)
@@ -44,12 +44,12 @@
static Text *activeToolText = NULL;
static SuggList suggestions = {NULL, NULL, NULL, NULL, NULL};
static char *documentation = NULL;
-static int doc_lines = 0;
+//static int doc_lines = 0;
static int txttl_cmp(const char *first, const char *second, int len) {
int cmp, i;
for (cmp=0, i=0; i<len; i++) {
- if (cmp= toupper(first[i])-toupper(second[i])) {
+ if ( (cmp= toupper(first[i])-toupper(second[i])) ) {
break;
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2008-09-05
05:17:26 UTC (rev 16374)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2008-09-05
06:05:25 UTC (rev 16375)
@@ -2243,7 +2243,7 @@
if ((mrk->flags & TMARK_TEMP) && !(mrk->flags &
TMARK_EDITALL)) {
txt_clear_markers(text, mrk->group,
TMARK_TEMP);
} else {
- TextMarker *nxt= mrk->next;
+ //TextMarker *nxt= mrk->next;
BLI_freelinkN(&text->markers, mrk);
}
return;
@@ -2308,7 +2308,7 @@
if ((mrk->flags & TMARK_TEMP) && !(mrk->flags &
TMARK_EDITALL)) {
txt_clear_markers(text, mrk->group,
TMARK_TEMP);
} else {
- TextMarker *nxt= mrk->next;
+ //TextMarker *nxt= mrk->next;
BLI_freelinkN(&text->markers, mrk);
}
return;
Modified: trunk/blender/source/blender/blenlib/SConscript
===================================================================
--- trunk/blender/source/blender/blenlib/SConscript 2008-09-05 05:17:26 UTC
(rev 16374)
+++ trunk/blender/source/blender/blenlib/SConscript 2008-09-05 06:05:25 UTC
(rev 16375)
@@ -24,4 +24,4 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
incs += ' ' + env['BF_PTHREADS_INC']
-env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs),
libtype=['core','player'], priority = [85,195], compileflags =cflags )
+env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs),
libtype=['core', 'intern', 'player'], priority = [85,150,195], compileflags
=cflags )
Modified: trunk/blender/source/blender/makesdna/DNA_ipo_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_ipo_types.h 2008-09-05
05:17:26 UTC (rev 16374)
+++ trunk/blender/source/blender/makesdna/DNA_ipo_types.h 2008-09-05
06:05:25 UTC (rev 16375)
@@ -142,24 +142,24 @@
#define MA_FRESTRAI 25
#define MA_ADD 26
-#define MA_MAP1 1<<5
-#define MA_MAP2 1<<6
-#define MA_MAP3 1<<7
-#define MA_MAP4 1<<8
-#define MA_MAP5 1<<9
-#define MA_MAP6 1<<10
-#define MA_MAP7 1<<11
-#define MA_MAP8 1<<12
-#define MA_MAP9 1<<13
-#define MA_MAP10 1<<14
-#define MA_MAP11 1<<15
-#define MA_MAP12 1<<16
-#define MA_MAP13 1<<17
-#define MA_MAP14 1<<18
-#define MA_MAP15 1<<19
-#define MA_MAP16 1<<20
-#define MA_MAP17 1<<21
-#define MA_MAP18 1<<22
+#define MA_MAP1 (1<<5)
+#define MA_MAP2 (1<<6)
+#define MA_MAP3 (1<<7)
+#define MA_MAP4 (1<<8)
+#define MA_MAP5 (1<<9)
+#define MA_MAP6 (1<<10)
+#define MA_MAP7 (1<<11)
+#define MA_MAP8 (1<<12)
+#define MA_MAP9 (1<<13)
+#define MA_MAP10 (1<<14)
+#define MA_MAP11 (1<<15)
+#define MA_MAP12 (1<<16)
+#define MA_MAP13 (1<<17)
+#define MA_MAP14 (1<<18)
+#define MA_MAP15 (1<<19)
+#define MA_MAP16 (1<<20)
+#define MA_MAP17 (1<<21)
+#define MA_MAP18 (1<<22)
#define TEX_TOTNAM 14
Modified: trunk/blender/source/blender/src/keyval.c
===================================================================
--- trunk/blender/source/blender/src/keyval.c 2008-09-05 05:17:26 UTC (rev
16374)
+++ trunk/blender/source/blender/src/keyval.c 2008-09-05 06:05:25 UTC (rev
16375)
@@ -390,7 +390,7 @@
}
/* Compare last part against key names */
- if (len-prev==1 || len-prev==4 && !strncmp(str+prev, "KEY", 3)) {
+ if ((len-prev==1) || ((len-prev==4) && !strncmp(str+prev, "KEY", 3))) {
if (str[prev]>='A' && str[prev]<='Z') {
*key= str[prev]-'A'+AKEY;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
