Revision: 56033
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56033
Author: kupoman
Date: 2013-04-14 00:40:54 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
Taking care of some warnings with shaders making use of some of the bgl
datatypes (Light, Material, TextureInfo).
Modified Paths:
--------------
branches/ge_harmony/source/blender/blenkernel/intern/shader.c
branches/ge_harmony/source/blender/makesdna/DNA_shader_types.h
Modified: branches/ge_harmony/source/blender/blenkernel/intern/shader.c
===================================================================
--- branches/ge_harmony/source/blender/blenkernel/intern/shader.c
2013-04-14 00:40:24 UTC (rev 56032)
+++ branches/ge_harmony/source/blender/blenkernel/intern/shader.c
2013-04-14 00:40:54 UTC (rev 56033)
@@ -237,6 +237,9 @@
else if (strcmp(type, "sampler2D") == 0) {
uni->type = SHADER_UNF_SAMPLER2D;
}
+ else if (starts_with(type, "sampler2D")) {
+ uni->type = SHADER_UNF_SAMPLER2D;
+ }
else if (starts_with(type, "mat")) {
uni->type = SHADER_UNF_MAT2;
uni->size = atoi(type+3);
@@ -244,6 +247,13 @@
uni->size *= uni->size;
data_size = sizeof(float);
}
+ else if (
+ strcmp(type, "Light") == 0 ||
+ strcmp(type, "Material") == 0 ||
+ strcmp(type, "TextureInfo") == 0
+ ) {
+ uni->type = SHADER_UNF_BUILTIN;
+ }
else {
printf("Data type %s is not supported\n", type);
MEM_freeN(uni);
Modified: branches/ge_harmony/source/blender/makesdna/DNA_shader_types.h
===================================================================
--- branches/ge_harmony/source/blender/makesdna/DNA_shader_types.h
2013-04-14 00:40:24 UTC (rev 56032)
+++ branches/ge_harmony/source/blender/makesdna/DNA_shader_types.h
2013-04-14 00:40:54 UTC (rev 56033)
@@ -133,6 +133,7 @@
#define SHADER_UNF_MAT2 11
#define SHADER_UNF_MAT3 12
#define SHADER_UNF_MAT4 13
+#define SHADER_UNF_BUILTIN 14
#endif //__DNA_SHADER_TYPES_H__
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
