Commit: e8ddd258efb0e473ea6ab2668ac0c2a86bd868a3
Author: Campbell Barton
Date: Wed Apr 12 00:49:05 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBe8ddd258efb0e473ea6ab2668ac0c2a86bd868a3
Correct own error in adding colors
Make comment regarding GLSL more clear.
===================================================================
M source/blender/draw/intern/draw_common.h
M source/blender/draw/modes/shaders/common_globals_lib.glsl
===================================================================
diff --git a/source/blender/draw/intern/draw_common.h
b/source/blender/draw/intern/draw_common.h
index b234adc7b99..ff57f5c5397 100644
--- a/source/blender/draw/intern/draw_common.h
+++ b/source/blender/draw/intern/draw_common.h
@@ -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__ */
\ No newline at end of file
+#endif /* __DRAW_COMMON__ */
diff --git a/source/blender/draw/modes/shaders/common_globals_lib.glsl
b/source/blender/draw/modes/shaders/common_globals_lib.glsl
index 099093363a9..dc36d252926 100644
--- a/source/blender/draw/modes/shaders/common_globals_lib.glsl
+++ b/source/blender/draw/modes/shaders/common_globals_lib.glsl
@@ -9,6 +9,8 @@ layout(std140) uniform globalsBlock {
vec4 colorGroupActive;
vec4 colorGroupSelect;
vec4 colorGroup;
+ vec4 colorLibrarySelect;
+ vec4 colorLibrary;
vec4 colorLamp;
vec4 colorSpeaker;
vec4 colorCamera;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
