diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 17:01:31 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 17:01:31 +0400 |
commit | dc39ecf0105353d309dd692f74a80b0ae3778091 (patch) | |
tree | ecbbe8cc8721c0c16d56b33f49af25190a19df6a /source/blender/blenkernel | |
parent | 0559630c7e4cbc9dce4e2998c9b8e52e6b2115f0 (diff) |
code cleanup: remove old/unused bmesh bevel transform mode, remove commented character list UI widget and the members these used in 'G' global.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_bmesh.h | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_global.h | 32 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/bmfont.c | 5 |
4 files changed, 15 insertions, 36 deletions
diff --git a/source/blender/blenkernel/BKE_bmesh.h b/source/blender/blenkernel/BKE_bmesh.h index 7bd131ed704..0dfab26e9f0 100644 --- a/source/blender/blenkernel/BKE_bmesh.h +++ b/source/blender/blenkernel/BKE_bmesh.h @@ -90,16 +90,6 @@ typedef struct BME_TransData_Head { int len; } BME_TransData_Head; -/* this is no longer used */ -typedef struct BME_Glob { /* stored in Global G for Transform() purposes */ - struct BMesh *bm; - BME_TransData_Head *td; - struct TransInfo *Trans; /* a pointer to the global Trans struct */ - int imval[2]; /* for restoring original mouse co when initTransform() is called multiple times */ - int options; - int res; -} BME_Glob; - struct BME_TransData *BME_get_transdata(struct BME_TransData_Head *td, struct BMVert *v); void BME_free_transdata(struct BME_TransData_Head *td); struct BMesh *BME_bevel(struct BMesh *bm, float value, int res, int options, int defgrp_index, float angle, diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index 53964f4689f..8daec1a6bac 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -55,18 +55,21 @@ typedef struct Global { /* strings: lastsaved */ char ima[1024], lib[1024]; /* 1024 = FILE_MAX */ - /* flag: if != 0 G.main->name contains valid relative base path */ - int relbase_valid; + /* when set: G.main->name contains valid relative base path */ + bool relbase_valid; + bool file_loaded; + bool save_over; /* strings of recent opened files */ struct ListBase recent_files; /* has escape been pressed or Ctrl+C pressed in background mode, used for render quit */ - short is_break; + bool is_break; - short moving, file_loaded; - char background; - char factory_startup; + bool background; + bool factory_startup; + + short moving; short winpos, displaymode; /* used to be in Render */ /* to indicate render is busy, prevent renderwindow events etc */ @@ -82,25 +85,12 @@ typedef struct Global { /* debug flag, G_DEBUG, G_DEBUG_PYTHON & friends, set python or command line args */ int debug; - /* Used for BMesh transformations */ - struct BME_Glob *editBMesh; - - /* Frank's variables */ - int save_over; - - /* Rob's variables (keep here for WM recode) */ - int have_quicktime; - int ui_international; - int charstart; - int charmin; - int charmax; - struct VFont *selfont; - struct ListBase ttfdata; + bool have_quicktime; /* this variable is written to / read from FileGlobal->fileflags */ int fileflags; - /* save the allowed windowstate of blender when using -W or -w */ + /* save the allowed windowstate of blender when using -W or -w (GHOST_TWindowState) */ int windowstate; } Global; diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 197f65988e6..d3f4d6d06b0 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -150,10 +150,6 @@ void initglobals(void) G.windowstate = 0; #endif - G.charstart = 0x0000; - G.charmin = 0x0000; - G.charmax = 0xffff; - #ifndef WITH_PYTHON_SECURITY /* default */ G.f |= G_SCRIPT_AUTOEXEC; #else diff --git a/source/blender/blenkernel/intern/bmfont.c b/source/blender/blenkernel/intern/bmfont.c index a95e5bd8ed5..2d7249b54f5 100644 --- a/source/blender/blenkernel/intern/bmfont.c +++ b/source/blender/blenkernel/intern/bmfont.c @@ -50,12 +50,15 @@ #include <stdio.h> #include "MEM_guardedalloc.h" -#include "BKE_global.h" #include "IMB_imbuf_types.h" #include "BKE_bmfont.h" #include "BKE_bmfont_types.h" +#include "BLI_utildefines.h" + +#include "BKE_global.h" + void printfGlyph(bmGlyph *glyph) { printf("unicode: %d '%c'\n", glyph->unicode, glyph->unicode); |