[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50268] branches/soc-2011-tomato/source/ blender/imbuf/intern/colormanagement.c: Color management: some parts of previous commit were incorrect merged from WIP patch

[Sergey Sharybin]

Revision: 50268
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50268
Author:   nazgul
Date:     2012-08-29 18:11:51 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Color management: some parts of previous commit were incorrect merged from WIP 
patch

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c      
2012-08-29 18:08:34 UTC (rev 50267)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c      
2012-08-29 18:11:51 UTC (rev 50268)
@@ -1401,8 +1401,7 @@
        }
 }
 
-static void colormanage_check_view_settings(ColorManagedViewSettings 
*view_settings, const char *what,
-                                            const ColorManagedView 
*default_view)
+static void colormanage_check_view_settings(ColorManagedDisplaySettings 
*display_settings, ColorManagedViewSettings *view_settings, const char *what)
 {
        ColorManagedDisplay *display;
        ColorManagedView *default_view;
@@ -1478,7 +1477,7 @@
 
        for (scene = bmain->scene.first; scene; scene = scene->id.next) {
                colormanage_check_display_settings(&scene->display_settings, 
"scene", default_display);
-               colormanage_check_view_settings(&scene->display_settings, 
&scene->view_settings, "scene", default_view);
+               colormanage_check_view_settings(&scene->display_settings, 
&scene->view_settings, "scene");
        }
 
        /* ** check input color space settings ** */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs