Correct own error in adding colors

Make comment regarding GLSL more clear.
This commit is contained in:
Campbell Barton
2017-04-12 00:49:05 +10:00
parent 5a4fceff1b
commit e8ddd258ef
2 changed files with 5 additions and 4 deletions

View File

@@ -32,9 +32,8 @@ struct Batch;
struct Object;
struct SceneLayer;
/* Used as ubo but colors can be directly
* referenced as well */
/* Keep in sync with globalsBlock in shaders */
/* Used as ubo but colors can be directly referenced as well */
/* Keep in sync with: common_globals_lib.glsl (globalsBlock) */
typedef struct GlobalsUboStorage {
/* UBOs data needs to be 16 byte aligned (size of vec4) */
float colorWire[4];
@@ -119,4 +118,4 @@ void DRW_shgroup_armature_edit(
struct Object *ob, struct DRWPass *pass_bone_solid,
struct DRWPass *pass_bone_wire, struct DRWShadingGroup *shgrp_relationship_lines);
#endif /* __DRAW_COMMON__ */
#endif /* __DRAW_COMMON__ */

View File

@@ -9,6 +9,8 @@ layout(std140) uniform globalsBlock {
vec4 colorGroupActive;
vec4 colorGroupSelect;
vec4 colorGroup;
vec4 colorLibrarySelect;
vec4 colorLibrary;
vec4 colorLamp;
vec4 colorSpeaker;
vec4 colorCamera;