diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-06-28 18:14:52 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-06-28 18:14:52 +0400 |
| commit | a3e49a23d7c7679b640b2a565a772fa416349cac (patch) | |
| tree | f94af2791aaaba53622738e2b5f8ef20a6636281 /source | |
| parent | 3d34bec6e48b849a84ebbb6403d515797e7748ae (diff) | |
Hurmf, the previous commit to solve proper 3D preview re-renders broke how
buttons preview work. :)
The initialize of the variable should be in the initialize code, not in the
freeing code, tsk tsk!
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 25bfce44799..5c141b2fbce 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -2944,7 +2944,7 @@ void RE_Database_Free(Render *re) if(re->r.mode & R_RAYTRACE) freeoctree(re); re->totvlak=re->totvert=re->totlamp=re->tothalo= 0; - re->i.convertdone= re->i.partsdone= 0; + re->i.convertdone= 0; if(re->scene) if(re->scene->r.scemode & R_FREE_IMAGE) @@ -3168,7 +3168,8 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view) re->lights.first= re->lights.last= NULL; slurph_opt= 0; - + re->i.partsdone= 0; /* signal now in use for previewrender */ + /* in localview, lamps are using normal layers, objects only local bits */ if(re->scene->lay & 0xFF000000) lay= re->scene->lay & 0xFF000000; else lay= re->scene->lay; |