diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-06-03 10:17:18 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2011-06-03 10:17:18 +0800 |
| commit | 06b639e71026306d9d422ce8f56da847ea63c5de (patch) | |
| tree | c60e7c9c78cf3be5da668910eeda16026d01b6b1 | |
| parent | b7fe0062b97232ab19c1a617ca4ff3afc479b7a7 (diff) | |
| parent | 1a85b87fc9846879be0774a49993d3095eee36d1 (diff) | |
| download | clutter-06b639e71026306d9d422ce8f56da847ea63c5de.tar.gz | |
Merge branch 'master' into msvc-support
| -rw-r--r-- | clutter/clutter-media.c | 2 | ||||
| -rw-r--r-- | clutter/clutter-paint-volume.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clutter/clutter-media.c b/clutter/clutter-media.c index 676478151..c05e39b65 100644 --- a/clutter/clutter-media.c +++ b/clutter/clutter-media.c @@ -89,7 +89,7 @@ clutter_media_default_init (ClutterMediaInterface *iface) */ pspec = g_param_spec_boolean ("playing", P_("Playing"), - P_("Wheter the actor is playing"), + P_("Whether the actor is playing"), FALSE, CLUTTER_PARAM_READWRITE); g_object_interface_install_property (iface, pspec); diff --git a/clutter/clutter-paint-volume.c b/clutter/clutter-paint-volume.c index 43e456276..5eea61b39 100644 --- a/clutter/clutter-paint-volume.c +++ b/clutter/clutter-paint-volume.c @@ -963,7 +963,7 @@ _clutter_paint_volume_cull (ClutterPaintVolume *pv, out++; } - if (out == 4) + if (out == vertex_count) return CLUTTER_CULL_RESULT_OUT; else if (out != 0) partial = TRUE; |