blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Cleanup / Cycles: Remove unused defines and some other minor changes.

This commit is contained in:
Thomas Dinges 2014-07-16 22:36:31 +02:00
parent 57a3403bc0
commit 85c7fce3de
Notes: blender-bot 2023-02-14 10:20:00 +01:00 
Referenced by issue #41123, Add Transparent Shader to Mix Shader with Material Panel open equals crash - OSL segtfault?
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/kernel/kernel_types.h
View File

@ -392,10 +392,8 @@ typedef enum LightType {
LIGHT_DISTANT,
LIGHT_BACKGROUND,
LIGHT_AREA,
LIGHT_AO,
LIGHT_SPOT,
LIGHT_TRIANGLE,
LIGHT_STRAND
LIGHT_TRIANGLE
} LightType;
/* Camera Type */
@ -530,13 +528,11 @@ typedef struct ShaderClosure {
float data0;
float data1;
float data2;
float3 N;
#if defined(__ANISOTROPIC__) || defined(__SUBSURFACE__) || defined(__HAIR__)
float3 T;
#endif
float data2;
#ifdef __OSL__
void *prim;
#endif
@ -927,7 +923,6 @@ typedef enum CurveFlag {
} CurveFlag;
typedef struct KernelCurves {
/* strand intersect and normal parameters - many can be changed to flags */
int curveflags;
int subdivisions;