Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-08-11 00:57:12 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-08-11 00:57:12 +0400
commit8dd523a154d1adfa28453c1fab00e7fd8e7e502d (patch)
tree577caa06034e6f625b043c1770da0a3306702656 /source/blender/blenkernel
parent24b7d90e952a3f7f20729e9fa765b39ae09ccd8a (diff)
2.5: Fixes
* Disable shaded mode for now, it cause too many crashes combined with preview render, will be fixed properly later. * Make 3d view toolbar region a bit wider. Ideally this would not be needed, but the sculpt/paint buttons just don't fit otherwise. * Revert change to icon/text spacing in buttons, it breaks text editing and clipping. Will properly fix this later so changing the spacing can be done centrally. * Fix for grease pencil simplify stroke python error. Now button is hidden (as in 2.4), but still available through outliner. * Fix for memory leak in UI code, when using ctrl+Q menu. * Fix submenu > icon being drawn on some buttons where it was not needed.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/displist.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index cdf4b90cee1..069129c15da 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -315,6 +315,9 @@ static void init_fastshade_shadeinput(Render *re)
static Render *fastshade_get_render(Scene *scene)
{
+ // XXX 2.5: this crashes combined with previewrender
+ // due to global R so disabled for now
+#if 0
/* XXX ugly global still, but we can't do preview while rendering */
if(G.rendering==0) {
@@ -326,6 +329,7 @@ static Render *fastshade_get_render(Scene *scene)
}
return re;
}
+#endif
return NULL;
}