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>2006-03-12 17:51:33 +0300
committerTon Roosendaal <ton@blender.org>2006-03-12 17:51:33 +0300
commit0e44aa60b252547da82c04408bf15b1f3212aa9c (patch)
treea201ef22dbe023d5810ec2f1a0db1a24835df3a9
parentde0262e4c81c7d7f036cc574f636a248f2cc9f27 (diff)
Half fix for colorpicker: after using sliders, the redraw callback was
too late... moved it one line up. :) Still unknown; why doesn't HSV color field not redraw?
-rw-r--r--source/blender/imbuf/SConscript2
-rw-r--r--source/blender/imbuf/intern/cineon/SConscript18
-rw-r--r--source/blender/src/interface.c2
3 files changed, 20 insertions, 2 deletions
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 2cc67df9e0c..7055fcfd46a 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -24,4 +24,4 @@ if env['WITH_BF_QUICKTIME']==1:
defs.append('WITH_QUICKTIME')
env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] )
-env.BlenderLib ( libname = "bf_imbuf_cineondpx" sources = cineon, includes = Split(cincs), defines = defs, libtype=['core', 'player'] priority = [81, 41] ) \ No newline at end of file
+env.BlenderLib ( libname = "bf_imbuf_cineondpx", sources = cineon, includes = Split(cincs), defines = defs, libtype=['core', 'player'], priority = [81, 41] )
diff --git a/source/blender/imbuf/intern/cineon/SConscript b/source/blender/imbuf/intern/cineon/SConscript
new file mode 100644
index 00000000000..e23027b43de
--- /dev/null
+++ b/source/blender/imbuf/intern/cineon/SConscript
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+Import ('env')
+
+#source_files = ['cineon_dpx.c', 'cineonlib.c']
+source_files = env.Glob('*.c')
+
+incs = ['.',
+ '../../../blenkernel',
+ '../../',
+ '..',
+ '../../../blenlib',
+ 'intern/include',
+ '#/intern/guardedalloc',
+ '../../../makesdna']
+
+defs = []
+
+env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [90, 200])
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index 26116126c76..7d660d01a1d 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -2458,8 +2458,8 @@ static int ui_do_but_SLI(uiBut *but)
ui_check_but(but);
ui_draw_but(but);
- ui_block_flush_back(but->block);
uibut_do_func(but);
+ ui_block_flush_back(but->block);
return but->retval;
}