[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56739] branches/ge_harmony/source/blender /blenkernel/intern/shader.c: Fixing a bug where default uniform values overwrote cached values.
Daniel Stokes
kupomail at gmail.com
Mon May 13 04:46:57 CEST 2013
Revision: 56739
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56739
Author: kupoman
Date: 2013-05-13 02:46:54 +0000 (Mon, 13 May 2013)
Log Message:
-----------
Fixing a bug where default uniform values overwrote cached values.
Modified Paths:
--------------
branches/ge_harmony/source/blender/blenkernel/intern/shader.c
Modified: branches/ge_harmony/source/blender/blenkernel/intern/shader.c
===================================================================
--- branches/ge_harmony/source/blender/blenkernel/intern/shader.c 2013-05-13 02:38:35 UTC (rev 56738)
+++ branches/ge_harmony/source/blender/blenkernel/intern/shader.c 2013-05-13 02:46:54 UTC (rev 56739)
@@ -395,12 +395,12 @@
name = extract_token(&src);
id = BLI_strdupcat(name, type);
uni = (Uniform *)BLI_ghash_pop(sh->uniform_cache, id, NULL);
- if (!uni)
+ if (!uni) {
uni = uniform_init(type, name);
-
- while (*src++ != ';') {
- if (*src == '=')
- extract_default(src+1, uni);
+ while (*src++ != ';') {
+ if (*src == '=')
+ extract_default(src+1, uni);
+ }
}
BLI_addtail(&sh->uniforms, uni);
MEM_freeN(type);
More information about the Bf-blender-cvs
mailing list