← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/blender/nodes/intern/SHD_nodes/SHD_material.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/nodes/intern/SHD_nodes/SHD_material.c
1
1
/**
2
 
 * $Id: SHD_material.c 16366 2008-09-04 20:51:28Z blendix $
 
2
 * $Id: SHD_material.c 20424 2009-05-26 13:46:08Z ton $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
130
130
                                nodestack_get_vec(&shi->translucency, SOCK_VALUE, in[MAT_IN_TRANSLUCENCY]);                     
131
131
                }
132
132
                
 
133
                shi->nodes= 1; /* temp hack to prevent trashadow recursion */
133
134
                node_shader_lamp_loop(shi, &shrnode);   /* clears shrnode */
 
135
                shi->nodes= 0;
134
136
                
135
137
                /* write to outputs */
136
138
                if(node->custom1 & SH_NODE_MAT_DIFF) {