projects
/
profile
/
ivi
/
clutter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ceb5708
)
material: copy_differences: handle copying fog state
author
Robert Bragg
<robert@linux.intel.com>
Sat, 10 Jul 2010 00:36:22 +0000
(
01:36
+0100)
committer
Robert Bragg
<robert@linux.intel.com>
Tue, 13 Jul 2010 18:26:57 +0000
(19:26 +0100)
When the support for redirecting the legacy fog state through cogl
material was added in
9b9e764dc
, the code to handle copying the fog
state in _cogl_material_copy_differences was missed.
clutter/cogl/cogl/cogl-material.c
patch
|
blob
|
history
diff --git
a/clutter/cogl/cogl/cogl-material.c
b/clutter/cogl/cogl/cogl-material.c
index
6fc658c
..
5cd53f3
100644
(file)
--- a/
clutter/cogl/cogl/cogl-material.c
+++ b/
clutter/cogl/cogl/cogl-material.c
@@
-1089,6
+1089,13
@@
_cogl_material_copy_differences (CoglMaterial *dest,
sizeof (CoglMaterialDepthState));
}
+ if (differences & COGL_MATERIAL_STATE_FOG)
+ {
+ memcpy (&big_state->fog_state,
+ &src->big_state->fog_state,
+ sizeof (CoglMaterialFogState));
+ }
+
if (differences & COGL_MATERIAL_STATE_POINT_SIZE)
big_state->point_size = src->big_state->point_size;