kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix one more crash introduced with r36384: trying to bake resulted in a segfault

Browse Source 
Also, use tabs for indentation in previous fix for the same crash
This commit is contained in:
Sergey Sharybin 2011-04-30 13:47:25 +00:00
parent dfa69dad3a
commit d2218cb7f3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/render/intern/source/convertblender.c
View File

@ -5659,7 +5659,7 @@ void RE_Database_FromScene_Vectors(Render *re, Main *bmain, Scene *sce, unsigned
*/ */
void RE_Database_Baking(Render *re, Main *bmain, Scene *scene, unsigned int lay, int type, Object *actob) void RE_Database_Baking(Render *re, Main *bmain, Scene *scene, unsigned int lay, int type, Object *actob)
{ {
Object *camera= RE_GetCamera(re); Object *camera;
float mat[4][4]; float mat[4][4];
float amb[3]; float amb[3];
int onlyselected, nolamps; int onlyselected, nolamps;
@ -5701,6 +5701,8 @@ void RE_Database_Baking(Render *re, Main *bmain, Scene *scene, unsigned int lay,
if(re->lay & 0xFF000000) if(re->lay & 0xFF000000)
lay &= 0xFF000000; lay &= 0xFF000000;
camera= RE_GetCamera(re);
/* if no camera, set unit */ /* if no camera, set unit */
if(camera) { if(camera) {
normalize_m4(camera->obmat); normalize_m4(camera->obmat);

2
source/blender/render/intern/source/pipeline.c
View File

@ -3149,7 +3149,7 @@ void RE_PreviewRender(Render *re, Main *bmain, Scene *sce)
re->scene = sce; re->scene = sce;
re->lay = sce->lay; re->lay = sce->lay;
camera = RE_GetCamera(re); camera = RE_GetCamera(re);
RE_SetCamera(re, camera); RE_SetCamera(re, camera);
do_render_3d(re); do_render_3d(re);