merged from trunk 20741:20848
* Missing changes to release/windows/installer * Sequencer fixes in source/blender/src/seqaudio.c dont apply to 2.5 * brechts fix for #18855 r20763 wasnt merged, does this apply to 2.5?
This commit is contained in:
@@ -39,8 +39,9 @@ struct RAS_LightObject
|
||||
LIGHT_NORMAL
|
||||
};
|
||||
bool m_modified;
|
||||
int m_layer;
|
||||
int m_layer;
|
||||
void *m_scene;
|
||||
void *m_light;
|
||||
|
||||
float m_energy;
|
||||
float m_distance;
|
||||
@@ -55,7 +56,6 @@ struct RAS_LightObject
|
||||
float m_spotblend;
|
||||
|
||||
LightType m_type;
|
||||
MT_CmMatrix4x4* m_worldmatrix;
|
||||
|
||||
bool m_nodiffuse;
|
||||
bool m_nospecular;
|
||||
|
Reference in New Issue
Block a user