diff options
author | Ton Roosendaal <ton@blender.org> | 2007-01-28 15:20:07 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2007-01-28 15:20:07 +0300 |
commit | c7718d2bcd644286c7f9ceed0a60118a9cd81589 (patch) | |
tree | f8762401bb14b70858a12be1f011662ed636f3b1 /source/blender/src/meshtools.c | |
parent | c45e05706200a39c08519bd5b86392cc5ddbc699 (diff) |
- bugfix in Sculpt (irc reported): using a Texture Brush, and then unlink
the texture (in texture buttons) crashed painting. Reason was reading
a NULL pointer.
- fix for bufix: commit by Ken Hughes accidentally deleted a bugfix
(yafray render doesn't support bake, and should return)
- tooltip fix
Diffstat (limited to 'source/blender/src/meshtools.c')
-rw-r--r-- | source/blender/src/meshtools.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c index 48f0f46128d..d23870f75e8 100644 --- a/source/blender/src/meshtools.c +++ b/source/blender/src/meshtools.c @@ -797,10 +797,15 @@ void objects_bake_render_menu(void) /* all selected meshes with UV maps are rendered for current scene visibility */ void objects_bake_render(short event) { - short prev_r_raytrace, prev_wo_amb_occ; + short prev_r_raytrace= 0, prev_wo_amb_occ= 0; if(event==0) event= G.scene->r.bake_mode; + if(G.scene->r.renderer!=R_INTERN) { + error("Bake only supported for Internal Renderer"); + return; + } + if(event>0) { Render *re= RE_NewRender("_Bake View_"); ScrArea *area= biggest_image_area(); |