[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32774] trunk/blender/source/blender: warning/portability fixes.
Campbell Barton
ideasman42 at gmail.com
Sat Oct 30 19:16:37 CEST 2010
Revision: 32774
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32774
Author: campbellbarton
Date: 2010-10-30 19:16:37 +0200 (Sat, 30 Oct 2010)
Log Message:
-----------
warning/portability fixes.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_brush.h
trunk/blender/source/blender/blenkernel/BKE_utildefines.h
trunk/blender/source/blender/blenlib/intern/BLI_mempool.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
Modified: trunk/blender/source/blender/blenkernel/BKE_brush.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_brush.h 2010-10-30 17:13:03 UTC (rev 32773)
+++ trunk/blender/source/blender/blenkernel/BKE_brush.h 2010-10-30 17:16:37 UTC (rev 32774)
@@ -36,7 +36,7 @@
struct ImBuf;
struct Scene;
struct wmOperator;
-enum CurveMappingPreset;
+// enum CurveMappingPreset;
/* datablock functions */
struct Brush *add_brush(const char *name);
Modified: trunk/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_utildefines.h 2010-10-30 17:13:03 UTC (rev 32773)
+++ trunk/blender/source/blender/blenkernel/BKE_utildefines.h 2010-10-30 17:16:37 UTC (rev 32774)
@@ -279,8 +279,11 @@
/*little macro so inline keyword works*/
#if defined(_MSC_VER)
#define BM_INLINE static __forceinline
+#elif defined(__GNUC__)
+#define BM_INLINE static inline __attribute((always_inline))
#else
-#define BM_INLINE static inline __attribute((always_inline))
+#warning "MSC/GNUC defines not found, inline non-functional"
+#define BM_INLINE static
#endif
#define BMEMSET(mem, val, size) {unsigned int _i; char *_c = (char*) mem; for (_i=0; _i<size; _i++) *_c++ = val;}
Modified: trunk/blender/source/blender/blenlib/intern/BLI_mempool.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_mempool.c 2010-10-30 17:13:03 UTC (rev 32773)
+++ trunk/blender/source/blender/blenlib/intern/BLI_mempool.c 2010-10-30 17:16:37 UTC (rev 32774)
@@ -154,9 +154,11 @@
first = pool->chunks.first;
BLI_remlink(&pool->chunks, first);
- for(mpchunk = pool->chunks.first; mpchunk; mpchunk = mpchunk->next)
- pool->use_sysmalloc ? free(mpchunk->data) : MEM_freeN(mpchunk->data);
-
+ for(mpchunk = pool->chunks.first; mpchunk; mpchunk = mpchunk->next) {
+ if(pool->use_sysmalloc) free(mpchunk->data);
+ else MEM_freeN(mpchunk->data);
+ }
+
pool->use_sysmalloc ? BLI_freelist(&(pool->chunks)) : BLI_freelistN(&(pool->chunks));
BLI_addtail(&pool->chunks, first);
@@ -175,9 +177,18 @@
void BLI_mempool_destroy(BLI_mempool *pool)
{
BLI_mempool_chunk *mpchunk=NULL;
- for(mpchunk = pool->chunks.first; mpchunk; mpchunk = mpchunk->next)
- pool->use_sysmalloc ? free(mpchunk->data) : MEM_freeN(mpchunk->data);
-
- pool->use_sysmalloc ? BLI_freelist(&(pool->chunks)) : BLI_freelistN(&(pool->chunks));
- pool->use_sysmalloc ? free(pool) : MEM_freeN(pool);
+ if(pool->use_sysmalloc) {
+ for(mpchunk = pool->chunks.first; mpchunk; mpchunk = mpchunk->next) {
+ free(mpchunk->data);
+ }
+ BLI_freelist(&(pool->chunks));
+ free(pool);
+ }
+ else {
+ for(mpchunk = pool->chunks.first; mpchunk; mpchunk = mpchunk->next) {
+ MEM_freeN(mpchunk->data);
+ }
+ BLI_freelistN(&(pool->chunks));
+ MEM_freeN(pool);
+ }
}
Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c 2010-10-30 17:13:03 UTC (rev 32773)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c 2010-10-30 17:16:37 UTC (rev 32774)
@@ -1035,12 +1035,17 @@
/* make this screen usable */
/* for file read and first use, for scaling window, area moves */
void ED_screen_refresh(wmWindowManager *wm, wmWindow *win)
-{
- ScrArea *sa;
- rcti winrct= {0, win->sizex-1, 0, win->sizey-1};
-
+{
/* exception for bg mode, we only need the screen context */
if (!G.background) {
+ ScrArea *sa;
+ rcti winrct;
+
+ winrct.xmin= 0;
+ winrct.xmax= win->sizex-1;
+ winrct.ymin= 0;
+ winrct.ymin= win->sizey-1;
+
screen_test_scale(win->screen, win->sizex, win->sizey);
if(win->screen->mainwin==0)
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2010-10-30 17:13:03 UTC (rev 32773)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2010-10-30 17:16:37 UTC (rev 32774)
@@ -1502,7 +1502,6 @@
{
Scene *scene= CTX_data_scene(C);
Sequence *seq, *last_seq = seq_active_get(scene);
- char *error_msg;
if(last_seq->seq1==NULL || last_seq->seq2 == NULL) {
BKE_report(op->reports, RPT_ERROR, "No valid inputs to swap");
More information about the Bf-blender-cvs
mailing list