[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56076] trunk/blender/source/blender/ render/intern/source/render_result.c: Fix crash rendering environment maps.

[Tamito KAJIYAMA]

Hi Brecht,

The call of BKE_freestyle_config_init() was moved to that place in revision 56075,
and the function call in the previous place was intentional but for a wrong reason:
I was confused by RenderLayer and SceneRenderLayer.  Because of the comment
quoted below, I was copying and pasting the same function call from scene.c.

> /* note, this has to be in sync with scene.c */

Thanks for the fix anyway.

Best regards,

-- 
KAJIYAMA, Tamito <rd6t-kjym at asahi-net.or.jp>


-----Original Message----- 
From: Brecht Van Lommel
Sent: Tuesday, April 16, 2013 12:12 AM
To: bf-blender-cvs at blender.org
Subject: [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56076] trunk/blender/source/blender/ 
render/intern/source/render_result.c: Fix crash rendering environment maps.

Revision: 56076
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56076
Author:   blendix
Date:     2013-04-15 23:12:54 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
Fix crash rendering environment maps. I think this freestyle code was not
intended to be here and probably was left over from some earlier code, as
resetting the configuration on render would lead to data loss.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/render_result.c

Modified: trunk/blender/source/blender/render/intern/source/render_result.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/render_result.c 2013-04-15 23:12:52 UTC (rev 56075)
+++ trunk/blender/source/blender/render/intern/source/render_result.c 2013-04-15 23:12:54 UTC (rev 56076)
@@ -538,8 +538,6 @@
  render_layer_add_pass(rr, rl, 3, SCE_PASS_TRANSM_INDIRECT);
  if (srl->passflag  & SCE_PASS_TRANSM_COLOR)
  render_layer_add_pass(rr, rl, 3, SCE_PASS_TRANSM_COLOR);
-
- BKE_freestyle_config_init(&srl->freestyleConfig);
  }
  /* sss, previewrender and envmap don't do layers, so we make a default one */
  if (rr->layers.first == NULL && !(layername && layername[0])) {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs at blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs