Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/imbuf/intern/cineon/cineon_dpx.c')
-rw-r--r--source/blender/imbuf/intern/cineon/cineon_dpx.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c
index 514d6b5522b..8b7ef8c8101 100644
--- a/source/blender/imbuf/intern/cineon/cineon_dpx.c
+++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c
@@ -42,16 +42,18 @@
#include "MEM_guardedalloc.h"
-/* ugly bad level, should be fixed */
-#include "DNA_scene_types.h"
-#include "BKE_global.h"
-
static void cineon_conversion_parameters(LogImageByteConversionParameters *params)
{
- params->blackPoint = G.scene?G.scene->r.cineonblack:95;
- params->whitePoint = G.scene?G.scene->r.cineonwhite:685;
- params->gamma = G.scene?G.scene->r.cineongamma:1.7f;
- params->doLogarithm = G.scene?G.scene->r.subimtype & R_CINEON_LOG:0;
+// params->blackPoint = scene?scene->r.cineonblack:95;
+// params->whitePoint = scene?scene->r.cineonwhite:685;
+// params->gamma = scene?scene->r.cineongamma:1.7f;
+// params->doLogarithm = scene?scene->r.subimtype & R_CINEON_LOG:0;
+
+ params->blackPoint = 95;
+ params->whitePoint = 685;
+ params->gamma = 1.7f;
+ params->doLogarithm = 0;
+
}
static struct ImBuf *imb_load_dpx_cineon(unsigned char *mem, int use_cineon, int size, int flags)