diff options
| author | Ben Batt <benbatt@gmail.com> | 2006-11-07 08:32:39 +0300 |
|---|---|---|
| committer | Ben Batt <benbatt@gmail.com> | 2006-11-07 08:32:39 +0300 |
| commit | de7b03aca7d430dc7a551c5c919acf370aa1dc56 (patch) | |
| tree | aaae4f4bf28f72abd1a731e357d69af52c9bf7a4 /source/blender/blenkernel/BKE_global.h | |
| parent | e144a05114428804fe4ab004adb6d5129e8f0634 (diff) | |
Fix for bug #5176: Crash when using display mode "Draw Sharp"
This was a sculpt mode merge problem: the G_DRAWSHARP and G_SCULPTMODE flags
had the same value, so Blender thought it was in sculpt mode when "Draw Sharp"
was turned on, leading to segfaults.
I have moved the G_SCULPTMODE flag to an unused value.
Diffstat (limited to 'source/blender/blenkernel/BKE_global.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index a7f36e74dcb..e2308d2ac2c 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -175,7 +175,6 @@ typedef struct Global { #define G_DRAWCREASES (1 << 19) #define G_DRAWSEAMS (1 << 20) #define G_HIDDENEDGES (1 << 21) -#define G_DRAWSHARP (1 << 28) /* draw edges with the sharp flag */ /* Measurement info Drawing */ #define G_DRAW_EDGELEN (1 << 22) @@ -189,7 +188,8 @@ typedef struct Global { #define G_DRAW_VERSE_DEBUG (1 << 27) /*#endif*/ -#define G_SCULPTMODE (1 << 28) +#define G_DRAWSHARP (1 << 28) /* draw edges with the sharp flag */ +#define G_SCULPTMODE (1 << 29) /* G.fileflags */ |