[Bf-blender-cvs] [20c043d] multiview: From review: do not do cleanup only
Dalai Felinto
noreply at git.blender.org
Mon Mar 23 19:32:59 CET 2015
Commit: 20c043d4227f13fdd9804ea8bc510804bcd63692
Author: Dalai Felinto
Date: Mon Mar 23 18:13:43 2015 +0100
Branches: multiview
https://developer.blender.org/rB20c043d4227f13fdd9804ea8bc510804bcd63692
>From review: do not do cleanup only
===================================================================
M source/blender/render/intern/source/convertblender.c
M source/blender/render/intern/source/pipeline.c
===================================================================
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 2ef61eb..20c2b9f 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -5127,7 +5127,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l
re->scene_color_manage = BKE_scene_check_color_management_enabled(scene);
/* scene needs to be set to get camera */
- camera = RE_GetCamera(re);
+ camera= RE_GetCamera(re);
/* per second, per object, stats print this */
re->i.infostr= "Preparing Scene data";
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 31324b1..f53b9df 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -520,7 +520,6 @@ void RE_FreeRender(Render *re)
BLI_remlink(&RenderGlobal.renderlist, re);
MEM_freeN(re->eval_ctx);
-
MEM_freeN(re);
}
More information about the Bf-blender-cvs
mailing list