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:
authorTon Roosendaal <ton@blender.org>2008-01-14 22:03:27 +0300
committerTon Roosendaal <ton@blender.org>2008-01-14 22:03:27 +0300
commit28667a314e94da91de6121894dfd237217da0b80 (patch)
tree74bad101e5c1f1599decb7528c389b51fe1854fa /source/blender/makesdna/DNA_color_types.h
parentcdcba166f63dcb3c87bf1c99c4b7aae4f3481701 (diff)
Feature + Fix:
- while sampling color in image window, you now get the sampled color as a line drawn in the node editor Curve nodes, allowing quicker view of what values you actually change. - reverted temporary the patch [#6779] by Matthew Plough He replaced image drawing of backdrop-node-editor with our Texture drawing function. That call is extremely slow, and should be by definition slower than glDrawPixels (unless you don't upload the image each time to gfx mem). Drawing large frames (2k, 4k) in node editor became unacceptable slow, even with the neatest hardware around. (tested nvidia, ati) Probably (Campbell thinks) this is a bypass for Linux ATI cards? Anyhoo, this should be investigated further before applying. It better then becomes a user pref, or even much better: part of the OpenGL profiler we need.
Diffstat (limited to 'source/blender/makesdna/DNA_color_types.h')
-rw-r--r--source/blender/makesdna/DNA_color_types.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h
index a4224976f5f..3caa74c9a72 100644
--- a/source/blender/makesdna/DNA_color_types.h
+++ b/source/blender/makesdna/DNA_color_types.h
@@ -69,13 +69,16 @@ typedef struct CurveMapping {
CurveMap cm[4]; /* max 4 builtin curves per mapping struct now */
float black[3], white[3]; /* black/white point (black[0] abused for current frame) */
- float bwmul[3], padf; /* black/white point multiply value, for speed */
+ float bwmul[3]; /* black/white point multiply value, for speed */
+
+ float sample[3]; /* sample values, if flag set it draws line and intersection */
} CurveMapping;
/* cumapping->flag */
#define CUMA_DO_CLIP 1
#define CUMA_PREMULLED 2
#define CUMA_DRAW_CFRA 4
+#define CUMA_DRAW_SAMPLE 8
#endif