[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17438] branches/animsys2/source/blender/ src/drawaction.c: AnimSys2: Bugfix for frame number indicator
Revision: 17438
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17438
Author: aligorith
Date: 2008-11-13 05:15:19 +0100 (Thu, 13 Nov 2008)
Log Message:
---
AnimSys2: Bugfix for frame number indicator
Fixed the OpenGL voodoo needed to get the frame indicator showing in the right
place in the IPO Editor.
Modified Paths:
--
branches/animsys2/source/blender/src/drawaction.c
Modified: branches/animsys2/source/blender/src/drawaction.c
===
--- branches/animsys2/source/blender/src/drawaction.c 2008-11-13 03:44:14 UTC
(rev 17437)
+++ branches/animsys2/source/blender/src/drawaction.c 2008-11-13 04:15:19 UTC
(rev 17438)
@@ -393,7 +393,7 @@
void draw_cfra_number(float cfra)
{
- float xscale, yscale, x, y;
+ float xscale, yscale, yspace, ypixels, x;
short slen, time=0;
char str[32];
@@ -422,6 +422,14 @@
return;
}
+ /* move ortho view to align with slider in bottom */
+ glTranslatef(0.0f, G.v2d->cur.ymin, 0.0f);
+
+ /* bad hacks in drawing markers... inverse correct that as well */
+ yspace= G.v2d->cur.ymax - G.v2d->cur.ymin;
+ ypixels= G.v2d->mask.ymax - G.v2d->mask.ymin;
+ glTranslatef(0.0f, 5.0*yspace/ypixels, 0.0f);
+
/* because the frame number text is subject to the same scaling as the
contents of the view */
view2d_getscale(G.v2d, &xscale, &yscale);
glScalef(1.0/xscale, 1.0/yscale, 1.0);
@@ -434,20 +442,21 @@
/* get starting coordinates for drawing */
x= cfra * xscale;
- y= G.v2d->cur.ymin;
/* draw green box around/behind text */
BIF_ThemeColor(TH_CFRAME);
BIF_ThemeColorShadeAlpha(TH_CFRAME, 0, -100);
- glRectf(x, y, x+slen, y+20);
+ glRectf(x, 0, x+slen, 20);
/* draw current frame number - black text */
BIF_ThemeColor(TH_TEXT);
- ui_rasterpos_safe(x, y+3, 1.0);
+ ui_rasterpos_safe(x, 3, 1.0);
BIF_DrawString(G.fonts, str, 0);
- /* restore scaling */
+ /* restore view transform */
glScalef(xscale, yscale, 1.0);
+ glTranslatef(0.0f, -G.v2d->cur.ymin, 0.0f);
+ glTranslatef(0.0f, -5.0*yspace/ypixels, 0.0f);
}
void draw_cfra_action (void)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17437] branches/animsys2/source/blender: AnimSys2: Dopesheet - Filtering Options
Revision: 17437
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17437
Author: aligorith
Date: 2008-11-13 04:44:14 +0100 (Thu, 13 Nov 2008)
Log Message:
---
AnimSys2: Dopesheet - Filtering Options
Added a few basic options for filtering what gets displayed in the Dopesheet -
Selected, Non-Armature Objects, Armatures, Shapekeys, IPO blocks, Action
blocks, Constraint Channels.
There are still a few things that will need corrections before everything works
with this; namely, the keyframe summary for Object channels.
Modified Paths:
--
branches/animsys2/source/blender/makesdna/DNA_action_types.h
branches/animsys2/source/blender/src/drawaction.c
branches/animsys2/source/blender/src/editaction.c
branches/animsys2/source/blender/src/header_action.c
Modified: branches/animsys2/source/blender/makesdna/DNA_action_types.h
===
--- branches/animsys2/source/blender/makesdna/DNA_action_types.h
2008-11-13 02:18:35 UTC (rev 17436)
+++ branches/animsys2/source/blender/makesdna/DNA_action_types.h
2008-11-13 03:44:14 UTC (rev 17437)
@@ -246,11 +246,15 @@
/* DopeSheet filter-flag */
typedef enum DOPESHEET_FILTERFLAG {
/* general filtering */
- ADS_FILTER_ONLYSEL = (1<<0),
+ ADS_FILTER_ONLYSEL = (1<<0),
/* datatype-based filtering */
- ADS_FILTER_OBONLY = (1<<10),
- ADS_FILTER_ARMONLY = (1<<11),
+ ADS_FILTER_NOOBJ= (1<<4),
+ ADS_FILTER_NOARM= (1<<5),
+ ADS_FILTER_NOSHAPEKEYS = (1<<6),
+ ADS_FILTER_NOIPOS = (1<<7),
+ ADS_FILTER_NOACTS = (1<<8),
+ ADS_FILTER_NOCONSTRAINTS= (1<<9),
} DOPESHEET_FILTERFLAG;
/* DopeSheet general flags */
Modified: branches/animsys2/source/blender/src/drawaction.c
===
--- branches/animsys2/source/blender/src/drawaction.c 2008-11-13 02:18:35 UTC
(rev 17436)
+++ branches/animsys2/source/blender/src/drawaction.c 2008-11-13 03:44:14 UTC
(rev 17437)
@@ -1855,6 +1855,8 @@
{
static ActKeysInc aki;
+ // FIXME: include special checks for dopesheet channels here...
(dopesheet filtering could be added here too)
+
/* init data of static struct here */
if ((curarea->spacetype == SPACE_ACTION) && NLA_ACTION_SCALED &&
(G.saction->mode == SACTCONT_ACTION))
Modified: branches/animsys2/source/blender/src/editaction.c
===
--- branches/animsys2/source/blender/src/editaction.c 2008-11-13 02:18:35 UTC
(rev 17436)
+++ branches/animsys2/source/blender/src/editaction.c 2008-11-13 03:44:14 UTC
(rev 17437)
@@ -682,7 +682,7 @@
return;
/* IPO? */
- if (ob->ipo) {
+ if ((ob->ipo) && !(ads->filterflag & ADS_FILTER_NOIPOS)) {
IpoCurve *icu;
/* include ipo-expand widget? */
@@ -707,7 +707,7 @@
}
/* Action? */
- if (ob->action) {
+ if ((ob->action) && !(ads->filterflag & ADS_FILTER_NOACTS)) {
/* include action-expand widget? */
if ((filter_mode & ACTFILTER_CHANNELS) && !(filter_mode &
(ACTFILTER_IPOKEYS|ACTFILTER_ONLYICU))) {
ale= make_new_actlistelem(ob->action, ACTTYPE_FILLACTD,
base, ACTTYPE_OBJECT);
@@ -722,7 +722,7 @@
}
/* ShapeKeys? */
- if (key) {
+ if ((key) && !(ads->filterflag & ADS_FILTER_NOSHAPEKEYS)) {
/* include shapekey-expand widget? */
if ((filter_mode & ACTFILTER_CHANNELS) && !(filter_mode &
(ACTFILTER_IPOKEYS|ACTFILTER_ONLYICU))) {
ale= make_new_actlistelem(key, ACTTYPE_FILLSKED, base,
ACTTYPE_OBJECT);
@@ -736,7 +736,7 @@
}
/* Constraint Channels? */
- if (ob->constraintChannels.first) {
+ if ((ob->constraintChannels.first) && !(ads->filterflag &
ADS_FILTER_NOCONSTRAINTS)) {
bConstraintChannel *conchan;
/* include constraint-expand widget? */
@@ -807,6 +807,42 @@
continue;
}
+ /* additionally, dopesheet filtering also affects what
objects to consider */
+ if (ads->filterflag) {
+ if ( (ads->filterflag & ADS_FILTER_ONLYSEL) &&
!((base->flag & SELECT) || (base == sce->basact)) ) {
+ /* only selected should be shown */
+ continue;
+ }
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17436] trunk/blender/SConstruct: for scons on linux and other *nux systems
Revision: 17436
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17436
Author: campbellbarton
Date: 2008-11-13 03:18:35 +0100 (Thu, 13 Nov 2008)
Log Message:
---
for scons on linux and other *nux systems
only install locale data if international is enabled, only install fonts if
freetype is enabled.
Modified Paths:
--
trunk/blender/SConstruct
Modified: trunk/blender/SConstruct
===
--- trunk/blender/SConstruct2008-11-12 22:35:58 UTC (rev 17435)
+++ trunk/blender/SConstruct2008-11-13 02:18:35 UTC (rev 17436)
@@ -421,8 +421,18 @@
dn.remove('CVS')
if '.svn' in dn:
dn.remove('.svn')
+
for f in df:
- dotblendlist.append(dp+os.sep+f)
+ if not env['WITH_BF_INTERNATIONAL']:
+ if 'locale' in dp:
+ continue
+ if f == '.Blanguages':
+ continue
+ if not env['WITH_BF_FREETYPE']:
+ if f.endswith('.ttf'):
+ continue
+
+ dotblendlist.append(os.path.join(dp, f))
dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f)
dotblenderinstall = []
@@ -430,16 +440,17 @@
td, tf = os.path.split(targetdir)
dotblenderinstall.append(env.Install(dir=td,
source=srcfile))
- #-- .blender/scripts
- scriptpath='release/scripts'
- for dp, dn, df in os.walk(scriptpath):
- if 'CVS' in dn:
- dn.remove('CVS')
- if '.svn' in dn:
- dn.remove('.svn')
-
dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(scriptpath):]
- source=[dp+os.sep+f for f in df]
- scriptinstall.append(env.Install(dir=dir,source=source))
+ if env['WITH_BF_PYTHON']:
+ #-- .blender/scripts
+ scriptpath='release/scripts'
+ for dp, dn, df in os.walk(scriptpath):
+ if 'CVS' in dn:
+ dn.remove('CVS')
+ if '.svn' in dn:
+ dn.remove('.svn')
+
dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(scriptpath):]
+ source=[dp+os.sep+f for f in df]
+
scriptinstall.append(env.Install(dir=dir,source=source))
#-- icons
if env['OURPLATFORM']=='linux2':
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17435] trunk/blender/source/blender: 2 utility functions added for projection painting.
Revision: 17435
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17435
Author: campbellbarton
Date: 2008-11-12 23:35:58 +0100 (Wed, 12 Nov 2008)
Log Message:
---
2 utility functions added for projection painting.
* BLI_linklist_index() - to get an items index in a LinkList
* BLI_memarena_use_malloc() - BLI_memarena_use_calloc alredy existed but there
was no way to switch back to malloc.
also added texnodes to cmake
Modified Paths:
--
trunk/blender/source/blender/blenlib/BLI_linklist.h
trunk/blender/source/blender/blenlib/BLI_memarena.h
trunk/blender/source/blender/blenlib/intern/BLI_linklist.c
trunk/blender/source/blender/blenlib/intern/BLI_memarena.c
trunk/blender/source/blender/nodes/CMakeLists.txt
Modified: trunk/blender/source/blender/blenlib/BLI_linklist.h
===
--- trunk/blender/source/blender/blenlib/BLI_linklist.h 2008-11-12 22:03:11 UTC
(rev 17434)
+++ trunk/blender/source/blender/blenlib/BLI_linklist.h 2008-11-12 22:35:58 UTC
(rev 17435)
@@ -45,6 +45,7 @@
} LinkNode;
intBLI_linklist_length (struct LinkNode *list);
+intBLI_linklist_index (struct LinkNode *list, void
*ptr);
void BLI_linklist_reverse(struct LinkNode **listp);
Modified: trunk/blender/source/blender/blenlib/BLI_memarena.h
===
--- trunk/blender/source/blender/blenlib/BLI_memarena.h 2008-11-12 22:03:11 UTC
(rev 17434)
+++ trunk/blender/source/blender/blenlib/BLI_memarena.h 2008-11-12 22:35:58 UTC
(rev 17435)
@@ -50,6 +50,7 @@
struct MemArena* BLI_memarena_new(int bufsize);
void BLI_memarena_free (struct MemArena *ma);
+void BLI_memarena_use_malloc (struct MemArena *ma);
void BLI_memarena_use_calloc (struct MemArena *ma);
void* BLI_memarena_alloc (struct MemArena *ma,
int size);
Modified: trunk/blender/source/blender/blenlib/intern/BLI_linklist.c
===
--- trunk/blender/source/blender/blenlib/intern/BLI_linklist.c 2008-11-12
22:03:11 UTC (rev 17434)
+++ trunk/blender/source/blender/blenlib/intern/BLI_linklist.c 2008-11-12
22:35:58 UTC (rev 17435)
@@ -50,6 +50,18 @@
}
}
+int BLI_linklist_index(struct LinkNode *list, void *ptr)
+{
+ int index;
+
+ for (index = 0; list; list= list->next, index++) {
+ if (list->link == ptr)
+ return index;
+ }
+
+ return -1;
+}
+
void BLI_linklist_reverse(LinkNode **listp) {
LinkNode *rhead= NULL, *cur= *listp;
Modified: trunk/blender/source/blender/blenlib/intern/BLI_memarena.c
===
--- trunk/blender/source/blender/blenlib/intern/BLI_memarena.c 2008-11-12
22:03:11 UTC (rev 17434)
+++ trunk/blender/source/blender/blenlib/intern/BLI_memarena.c 2008-11-12
22:35:58 UTC (rev 17435)
@@ -60,6 +60,10 @@
ma->use_calloc= 1;
}
+void BLI_memarena_use_malloc(MemArena *ma) {
+ ma->use_calloc= 0;
+}
+
void BLI_memarena_free(MemArena *ma) {
BLI_linklist_free(ma->bufs, (void(*)(void*)) MEM_freeN);
MEM_freeN(ma);
Modified: trunk/blender/source/blender/nodes/CMakeLists.txt
===
--- trunk/blender/source/blender/nodes/CMakeLists.txt 2008-11-12 22:03:11 UTC
(rev 17434)
+++ trunk/blender/source/blender/nodes/CMakeLists.txt 2008-11-12 22:35:58 UTC
(rev 17435)
@@ -23,7 +23,7 @@
#
# * END GPL LICENSE BLOCK *
-FILE(GLOB SRC intern/*.c intern/CMP_nodes/*.c intern/SHD_nodes/*.c)
+FILE(GLOB SRC intern/*.c intern/CMP_nodes/*.c intern/SHD_nodes/*.c
intern/TEX_nodes/*.c)
SET(INC
. ../../../intern/guardedalloc ../include ../blenlib ../makesdna
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17433] branches/blender2.5/
Another big-ass 450K commit msg. Summarized for your convenience. -- Stephen Swaney [EMAIL PROTECTED] -- From: Brecht Van Lommel <[EMAIL PROTECTED]> To: bf-blender-cvs@blender.org Subject: SVN commit: /data/svn/bf-blender [17433] branches/blender2.5/blender: Reply-To: [EMAIL PROTECTED] X-Mailer: SVN::Notify 2.65: http://search.cpan.org/dist/SVN-Notify/ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <[EMAIL PROTECTED]> Date: Wed, 12 Nov 2008 22:17:07 +0100 (CET) Revision: 17433 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17433 Author: blendix Date: 2008-11-12 22:16:53 +0100 (Wed, 12 Nov 2008) Log Message: --- Merge of trunk into blender 2.5: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416 Issues: * GHOST/X11 had conflicting changes. Some code was added in 2.5, which was later added in trunk also, but reverted partially, specifically revision 16683. I have left out this reversion in the 2.5 branch since I think it is needed there. http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683 * Scons had various conflicting changes, I decided to go with trunk version for everything except priorities and some library renaming. * In creator.c, there were various fixes and fixes for fixes related to the -w -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done differently. Since this is changed so much, and I don't think those fixes would be needed in 2.5, I've left them out. * Also in creator.c: there was code for a python bugfix where the screen was not initialized when running with -P. The code that initializes the screen there I had to disable, that can't work in 2.5 anymore but left it commented as a reminder. Further I had to disable some new function calls. using src/ and python/, as was done already in this branch, disabled function calls: * bpath.c: error reporting * BME_conversions.c: editmesh conversion functions. * SHD_dynamic: disabled almost completely, there is no python/. * KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled. * text.c: clipboard copy call. * object.c: OB_SUPPORT_MATERIAL. * DerivedMesh.c and subsurf_ccg, stipple_quarttone. Still to be done: * Go over files and functions that were moved to a different location but could still use changes that were done in trunk. Revision Links: -- http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683 Modified Paths: -- branches/blender2.5/blender/CMake/macros.cmake branches/blender2.5/blender/CMakeLists.txt branches/blender2.5/blender/Makefile branches/blender2.5/blender/README branches/blender2.5/blender/SConstruct branches/blender2.5/blender/bin/.blender/.Blanguages branches/blender2.5/blender/bin/.blender/locale/ar/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/bg/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/ca/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/cs/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/de/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/es/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/fi/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/fr/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/hr/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/it/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/ja/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/nl/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/pl/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/ro/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/ru/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/sr/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/[EMAIL PROTECTED]/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/sv/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/uk/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo branches/blender2.5/blender/blenderplay [trimmed] ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17430] trunk/blender/source/blender/ blenkernel: Added stubs to fix linker errors in texnodes
Revision: 17430
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17430
Author: kakbarnf
Date: 2008-11-12 21:11:54 +0100 (Wed, 12 Nov 2008)
Log Message:
---
Added stubs to fix linker errors in texnodes
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h
trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
Modified: trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h
===
--- trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h
2008-11-12 19:16:46 UTC (rev 17429)
+++ trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h
2008-11-12 20:11:54 UTC (rev 17430)
@@ -230,5 +230,14 @@
void PE_get_colors(char sel[4], char nosel[4]);
void PE_recalc_world_cos(struct Object *ob, struct ParticleSystem *psys);
+/* texture.c */
+struct Tex;
+struct TexResult;
+int multitex_thread(struct Tex *tex, float *texvec, float *dxt, float *dyt,
int osatex, struct TexResult *texres, short thread, short which_output);
+
+/* previewrender.c */
+void BIF_preview_changed(short id_code);
+
+
#endif
Modified: trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
===
--- trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
2008-11-12 19:16:46 UTC (rev 17429)
+++ trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
2008-11-12 20:11:54 UTC (rev 17430)
@@ -347,3 +347,10 @@
char stipple_quarttone[1];
+/* texture.c */
+int multitex_thread(Tex *tex, float *texvec, float *dxt, float *dyt, int
osatex, TexResult *texres, short thread, short which_output) {}
+
+/* previewrender.c */
+void BIF_preview_changed(short id_code) {}
+
+
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17434] branches/blender2.5/blender:
Revision: 17434 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17434 Author: blendix Date: 2008-11-12 23:03:11 +0100 (Wed, 12 Nov 2008) Log Message: --- 2.5: merge with trunk, previous merge was only up to yesterday. svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD Modified Paths: -- branches/blender2.5/blender/SConstruct branches/blender2.5/blender/config/win32-mingw-config.py branches/blender2.5/blender/config/win32-vc-config.py branches/blender2.5/blender/projectfiles_vc9/blender/nodes/nodes.vcproj branches/blender2.5/blender/source/Makefile branches/blender2.5/blender/source/blender/blenkernel/BKE_node.h branches/blender2.5/blender/source/blender/blenkernel/intern/library.c branches/blender2.5/blender/source/blender/blenkernel/intern/material.c branches/blender2.5/blender/source/blender/blenkernel/intern/node.c branches/blender2.5/blender/source/blender/blenkernel/intern/texture.c branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c branches/blender2.5/blender/source/blender/makesdna/DNA_node_types.h branches/blender2.5/blender/source/blender/makesdna/DNA_texture_types.h branches/blender2.5/blender/source/blender/nodes/Makefile branches/blender2.5/blender/source/blender/nodes/SConscript branches/blender2.5/blender/source/blender/nodes/intern/SHD_nodes/SHD_texture.c branches/blender2.5/blender/source/blender/nodes/intern/SHD_util.c branches/blender2.5/blender/source/blender/render/extern/include/RE_shader_ext.h branches/blender2.5/blender/source/blender/render/intern/include/pixelshading.h branches/blender2.5/blender/source/blender/render/intern/include/texture.h branches/blender2.5/blender/source/blender/render/intern/source/convertblender.c branches/blender2.5/blender/source/blender/render/intern/source/pixelshading.c branches/blender2.5/blender/source/blender/render/intern/source/rayshade.c branches/blender2.5/blender/source/blender/render/intern/source/rendercore.c branches/blender2.5/blender/source/blender/render/intern/source/texture.c branches/blender2.5/blender/tools/Blender.py branches/blender2.5/blender/tools/btools.py Added Paths: --- branches/blender2.5/blender/source/blender/nodes/TEX_node.h branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/ branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/Makefile branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_checker.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_image.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_invert.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_output.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_proc.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.h Removed Paths: - branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/Makefile branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_checker.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_image.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_invert.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_output.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_proc.c branches/blen
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17397] branches/soc-2007-joeedh:
The following is an excerpt of an insanely large commit msg. I decided to summarize it rather than sending a half gig of text to everyone. -- Stephen Swaney [EMAIL PROTECTED] - From: Joseph Eagar <[EMAIL PROTECTED]> To: bf-blender-cvs@blender.org Subject: SVN commit: /data/svn/bf-blender [17397] branches/soc-2007-joeedh: set all files to svn:eol native. Reply-To: [EMAIL PROTECTED] X-Mailer: SVN::Notify 2.65: http://search.cpan.org/dist/SVN-Notify/ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <[EMAIL PROTECTED]> Date: Tue, 11 Nov 2008 04:11:25 +0100 (CET) Revision: 17397 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17397 Author: joeedh Date: 2008-11-11 04:11:19 +0100 (Tue, 11 Nov 2008) Log Message: --- set all files to svn:eol native. Property Changed: branches/soc-2007-joeedh/CMake/ branches/soc-2007-joeedh/CMake/macros.cmake branches/soc-2007-joeedh/CMakeLists.txt branches/soc-2007-joeedh/COPYING branches/soc-2007-joeedh/ChangeLog branches/soc-2007-joeedh/INSTALL branches/soc-2007-joeedh/Makefile branches/soc-2007-joeedh/README branches/soc-2007-joeedh/SConstruct branches/soc-2007-joeedh/bin/ branches/soc-2007-joeedh/bin/.blender/ branches/soc-2007-joeedh/bin/.blender/.Blanguages branches/soc-2007-joeedh/bin/.blender/.bfont.ttf branches/soc-2007-joeedh/bin/.blender/locale/ branches/soc-2007-joeedh/bin/.blender/locale/ar/ branches/soc-2007-joeedh/bin/.blender/locale/ar/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/ar/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/bg/ branches/soc-2007-joeedh/bin/.blender/locale/bg/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/bg/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/ca/ branches/soc-2007-joeedh/bin/.blender/locale/ca/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/ca/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/cs/ branches/soc-2007-joeedh/bin/.blender/locale/cs/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/cs/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/de/ branches/soc-2007-joeedh/bin/.blender/locale/de/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/de/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/el/ branches/soc-2007-joeedh/bin/.blender/locale/el/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/el/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/es/ branches/soc-2007-joeedh/bin/.blender/locale/es/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/es/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/fi/ branches/soc-2007-joeedh/bin/.blender/locale/fi/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/fi/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/fr/ branches/soc-2007-joeedh/bin/.blender/locale/fr/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/fr/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/hr/ branches/soc-2007-joeedh/bin/.blender/locale/hr/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/hr/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/hr_HR/ branches/soc-2007-joeedh/bin/.blender/locale/hr_HR/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/hr_HR/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/it/ branches/soc-2007-joeedh/bin/.blender/locale/it/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/it/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/ja/ branches/soc-2007-joeedh/bin/.blender/locale/ja/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/ja/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/nl/ branches/soc-2007-joeedh/bin/.blender/locale/nl/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/nl/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/pl/ branches/soc-2007-joeedh/bin/.blender/locale/pl/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/pl/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/ro/ branches/soc-2007-joeedh/bin/.blender/locale/ro/LC_MESSAGES/ branches/soc-2007-joeedh/bin/.blender/locale/ro/LC_MESSAGES/blender.mo branches/soc-2007-joeedh/bin/.blender/locale/ru/ branches/soc-2007-joeedh/bin/.blender/locale/ru/LC_MESSAGES/ [trimmed] ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17432] trunk/blender/projectfiles_vc9/ blender/nodes/nodes.vcproj: == MSVC projectfiles ==
Revision: 17432 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17432 Author: elubie Date: 2008-11-12 22:03:42 +0100 (Wed, 12 Nov 2008) Log Message: --- == MSVC projectfiles == update for texture nodes Modified Paths: -- trunk/blender/projectfiles_vc9/blender/nodes/nodes.vcproj Modified: trunk/blender/projectfiles_vc9/blender/nodes/nodes.vcproj === --- trunk/blender/projectfiles_vc9/blender/nodes/nodes.vcproj 2008-11-12 21:02:45 UTC (rev 17431) +++ trunk/blender/projectfiles_vc9/blender/nodes/nodes.vcproj 2008-11-12 21:03:42 UTC (rev 17432) @@ -316,6 +316,10 @@ RelativePath="..\..\..\source\blender\nodes\intern\SHD_util.c" > + + @@ -600,6 +604,70 @@ > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -629,6 +701,10 @@ RelativePath="..\..\..\source\blender\nodes\intern\SHD_util.h" > + + ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17431] trunk/blender/source/blender: fix bad level call in texture nodes
Revision: 17431
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17431
Author: elubie
Date: 2008-11-12 22:02:45 +0100 (Wed, 12 Nov 2008)
Log Message:
---
fix bad level call in texture nodes
BIF_preview_changed wasn't needed after all.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h
trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
trunk/blender/source/blender/nodes/intern/TEX_util.c
Modified: trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h
===
--- trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h
2008-11-12 20:11:54 UTC (rev 17430)
+++ trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h
2008-11-12 21:02:45 UTC (rev 17431)
@@ -235,8 +235,6 @@
struct TexResult;
int multitex_thread(struct Tex *tex, float *texvec, float *dxt, float *dyt,
int osatex, struct TexResult *texres, short thread, short which_output);
-/* previewrender.c */
-void BIF_preview_changed(short id_code);
#endif
Modified: trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
===
--- trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
2008-11-12 20:11:54 UTC (rev 17430)
+++ trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
2008-11-12 21:02:45 UTC (rev 17431)
@@ -348,9 +348,5 @@
char stipple_quarttone[1];
/* texture.c */
-int multitex_thread(Tex *tex, float *texvec, float *dxt, float *dyt, int
osatex, TexResult *texres, short thread, short which_output) {}
+int multitex_thread(Tex *tex, float *texvec, float *dxt, float *dyt, int
osatex, TexResult *texres, short thread, short which_output) {return 0;}
-/* previewrender.c */
-void BIF_preview_changed(short id_code) {}
-
-
Modified: trunk/blender/source/blender/nodes/intern/TEX_util.c
===
--- trunk/blender/source/blender/nodes/intern/TEX_util.c2008-11-12
20:11:54 UTC (rev 17430)
+++ trunk/blender/source/blender/nodes/intern/TEX_util.c2008-11-12
21:02:45 UTC (rev 17431)
@@ -209,7 +209,6 @@
ntreeTexExecTree(nodetree, &dummy_texres, coord, 1, 0, tex, 0);
ntreeEndExecTree(nodetree);
- BIF_preview_changed(ID_TE);
}
char* ntreeTexOutputMenu(bNodeTree *ntree)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17429] branches/etch-a-ton/source/blender : Sensible defaults with do_version
Revision: 17429
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17429
Author: theeth
Date: 2008-11-12 20:16:46 +0100 (Wed, 12 Nov 2008)
Log Message:
---
Sensible defaults with do_version
Auto names for name templating. When turned on, N will be incremented everytime
(after a stroke has been converted) and S will be set to "l" or "r" (or "L or
"R" if it already contains a capital L or R) depending on which side of the X
axis the stroke started on. Experimental, there might be some bugs left.
Modified Paths:
--
branches/etch-a-ton/source/blender/blenkernel/BKE_blender.h
branches/etch-a-ton/source/blender/blenloader/intern/readfile.c
branches/etch-a-ton/source/blender/makesdna/DNA_scene_types.h
branches/etch-a-ton/source/blender/src/drawview.c
branches/etch-a-ton/source/blender/src/editarmature_sketch.c
Modified: branches/etch-a-ton/source/blender/blenkernel/BKE_blender.h
===
--- branches/etch-a-ton/source/blender/blenkernel/BKE_blender.h 2008-11-12
19:16:13 UTC (rev 17428)
+++ branches/etch-a-ton/source/blender/blenkernel/BKE_blender.h 2008-11-12
19:16:46 UTC (rev 17429)
@@ -41,7 +41,7 @@
struct MemFile;
#define BLENDER_VERSION248
-#define BLENDER_SUBVERSION 1
+#define BLENDER_SUBVERSION 2
#define BLENDER_MINVERSION 245
#define BLENDER_MINSUBVERSION 15
Modified: branches/etch-a-ton/source/blender/blenloader/intern/readfile.c
===
--- branches/etch-a-ton/source/blender/blenloader/intern/readfile.c
2008-11-12 19:16:13 UTC (rev 17428)
+++ branches/etch-a-ton/source/blender/blenloader/intern/readfile.c
2008-11-12 19:16:46 UTC (rev 17429)
@@ -7372,47 +7372,7 @@
ima->flag |= IMA_DO_PREMUL;
}
}
-
- if (main->versionfile < 245 || main->subversionfile < 12)
- {
- /* initialize skeleton generation toolsettings */
- for(sce=main->scene.first; sce; sce = sce->id.next)
- {
- sce->toolsettings->skgen_resolution = 50;
- sce->toolsettings->skgen_threshold_internal
= 0.01f;
- sce->toolsettings->skgen_threshold_external
= 0.01f;
- sce->toolsettings->skgen_angle_limit
= 45.0f;
- sce->toolsettings->skgen_length_ratio
= 1.3f;
- sce->toolsettings->skgen_length_limit
= 1.5f;
- sce->toolsettings->skgen_correlation_limit
= 0.98f;
- sce->toolsettings->skgen_symmetry_limit
= 0.1f;
- sce->toolsettings->skgen_postpro = SKGEN_SMOOTH;
- sce->toolsettings->skgen_postpro_passes = 1;
- sce->toolsettings->skgen_options =
SKGEN_FILTER_INTERNAL|SKGEN_FILTER_EXTERNAL|SKGEN_SUB_CORRELATION;
- sce->toolsettings->skgen_subdivisions[0] =
SKGEN_SUB_CORRELATION;
- sce->toolsettings->skgen_subdivisions[1] =
SKGEN_SUB_LENGTH;
- sce->toolsettings->skgen_subdivisions[2] =
SKGEN_SUB_ANGLE;
- }
- }
}
-
- /* sanity check for skgen
-* */
- {
- Scene *sce;
- for(sce=main->scene.first; sce; sce = sce->id.next)
- {
- if (sce->toolsettings->skgen_subdivisions[0] ==
sce->toolsettings->skgen_subdivisions[1] ||
- sce->toolsettings->skgen_subdivisions[0] ==
sce->toolsettings->skgen_subdivisions[2] ||
- sce->toolsettings->skgen_subdivisions[1] ==
sce->toolsettings->skgen_subdivisions[2])
- {
-
sce->toolsettings->skgen_subdivisions[0] = SKGEN_SUB_CORRELATION;
-
sce->toolsettings->skgen_subdivisions[1] = SKGEN_SUB_LENGTH;
-
sce->toolsettings->skgen_subdivisions[2] = SKGEN_SUB_ANGLE;
- }
- }
- }
-
if ((main->versionfile < 245) || (main->versionfile == 245 &&
main->subversionfile < 2)) {
Image *ima;
@@ -7993,6 +7953,40 @@
}
}
+ if (main->versionfile < 248 || main->subversionfile < 2)
+ {
+ Scene *sce;
+
+ /* initialize skeleton generation toolsettings */
+ for(sce=main->scene.first;
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17428] branches/soc-2007-joeedh: normalized all file line endings
Revision: 17428 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17428 Author: joeedh Date: 2008-11-12 20:16:13 +0100 (Wed, 12 Nov 2008) Log Message: --- normalized all file line endings Modified Paths: -- branches/soc-2007-joeedh/extern/binreloc/CMakeLists.txt branches/soc-2007-joeedh/extern/binreloc/Makefile branches/soc-2007-joeedh/extern/binreloc/SConscript branches/soc-2007-joeedh/extern/binreloc/binreloc.c branches/soc-2007-joeedh/extern/binreloc/include/binreloc.h branches/soc-2007-joeedh/extern/bullet2/src/Bullet-C-Api.h branches/soc-2007-joeedh/extern/ffmpeg/SConscript branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/aac_ac3_parser.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/aac_ac3_parser.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/aac_parser.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/ac3.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/ac3_parser.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/ac3_parser.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/ac3tab.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/apedec.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/armv4l/mathops.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/armv4l/mpegvideo_armv5te.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/atrac3.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/atrac3data.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/audioconvert.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/bethsoftvideo.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/bethsoftvideo.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/bfin/config_bfin.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/bfin/dsputil_bfin.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/bfin/dsputil_bfin.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/bfin/mathops.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/bfin/mpegvideo_bfin.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/bitstream_filter.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/bmp.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/bmpenc.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/bytestream.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/c93.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/cavs.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/cavs.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/cavs_parser.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/cavsdata.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/cavsdec.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/cavsdsp.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/colorspace.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dca.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dca.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dca_parser.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dcadata.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dcahuff.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dnxhddata.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dnxhddata.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dnxhddec.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dsicinav.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dump_extradata_bsf.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dvbsub_parser.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dvdsub_parser.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dvdsubdec.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/dxa.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/elbg.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/elbg.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/eval.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/flacenc.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/flashsvenc.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/gif.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/gifdec.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/h261.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/h261_parser.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/h261dec.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/h261enc.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/h263.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/h263_parser.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/h263_parser.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/h264.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/h264_mp4toannexb_bsf.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/h264_parser.c branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/h264_parser.h branches/soc-2007-joeedh/extern/ffmpeg/libavcodec/h264dspenc.
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17427] trunk/blender/source/blender/nodes : Bah, two more files!
Revision: 17427
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17427
Author: ton
Date: 2008-11-12 20:14:46 +0100 (Wed, 12 Nov 2008)
Log Message:
---
Bah, two more files!
Added Paths:
---
trunk/blender/source/blender/nodes/TEX_node.h
trunk/blender/source/blender/nodes/intern/TEX_util.c
Added: trunk/blender/source/blender/nodes/TEX_node.h
===
--- trunk/blender/source/blender/nodes/TEX_node.h
(rev 0)
+++ trunk/blender/source/blender/nodes/TEX_node.h 2008-11-12 19:14:46 UTC
(rev 17427)
@@ -0,0 +1,70 @@
+/**
+ * $Id: CMP_node.h 12429 2007-10-29 14:37:19Z bebraw $
+ *
+ * * BEGIN GPL LICENSE BLOCK *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License. See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * * END GPL LICENSE BLOCK *
+ */
+
+#ifndef TEX_NODE_H
+#define TEX_NODE_H
+
+#include "BKE_node.h"
+
+
+/* ** types array for all texture nodes ** */
+
+extern bNodeType tex_node_math;
+extern bNodeType tex_node_mix_rgb;
+extern bNodeType tex_node_valtorgb;
+extern bNodeType tex_node_rgbtobw;
+extern bNodeType tex_node_output;
+extern bNodeType tex_node_viewer;
+extern bNodeType tex_node_checker;
+extern bNodeType tex_node_texture;
+extern bNodeType tex_node_bricks;
+extern bNodeType tex_node_image;
+extern bNodeType tex_node_curve_rgb;
+extern bNodeType tex_node_curve_time;
+extern bNodeType tex_node_invert;
+extern bNodeType tex_node_hue_sat;
+
+extern bNodeType tex_node_rotate;
+extern bNodeType tex_node_translate;
+
+extern bNodeType tex_node_proc_voronoi;
+extern bNodeType tex_node_proc_blend;
+extern bNodeType tex_node_proc_magic;
+extern bNodeType tex_node_proc_marble;
+extern bNodeType tex_node_proc_clouds;
+extern bNodeType tex_node_proc_wood;
+extern bNodeType tex_node_proc_musgrave;
+extern bNodeType tex_node_proc_noise;
+extern bNodeType tex_node_proc_stucci;
+extern bNodeType tex_node_proc_distnoise;
+
+#endif
Added: trunk/blender/source/blender/nodes/intern/TEX_util.c
===
--- trunk/blender/source/blender/nodes/intern/TEX_util.c
(rev 0)
+++ trunk/blender/source/blender/nodes/intern/TEX_util.c2008-11-12
19:14:46 UTC (rev 17427)
@@ -0,0 +1,271 @@
+/**
+ *
+ * * BEGIN GPL LICENSE BLOCK *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * * END GPL LICENSE BLOCK *
+ */
+
+/*
+ HOW TEXTURE NODES WORK
+
+ In contrast to Shader nodes, which place a colour into the output
+ stack when executed, Texture nodes place a TexDelegate* there. To
+ obtain a colour value from this, a node further up the chain reads
+ the TexDelegate* from its input stack, and uses tex_call_delegate to
+ retrieve the colour from the delegate.
+*/
+
+#include
+#include "TEX_util.h"
+
+#define PREV_RES 128 /* default preview resolution */
+
+void tex_call_delegate(TexDelegate *dg, float *out, float *coord, short thread)
+{
+ dg->fn
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17426] trunk/blender/source/blender/nodes /intern: Added new files for previous commit...
Revision: 17426 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17426 Author: ton Date: 2008-11-12 20:10:41 +0100 (Wed, 12 Nov 2008) Log Message: --- Added new files for previous commit... Added Paths: --- trunk/blender/source/blender/nodes/intern/TEX_nodes/ trunk/blender/source/blender/nodes/intern/TEX_nodes/Makefile trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_checker.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_image.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_invert.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_output.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_proc.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c trunk/blender/source/blender/nodes/intern/TEX_util.h Added: trunk/blender/source/blender/nodes/intern/TEX_nodes/Makefile === --- trunk/blender/source/blender/nodes/intern/TEX_nodes/Makefile (rev 0) +++ trunk/blender/source/blender/nodes/intern/TEX_nodes/Makefile 2008-11-12 19:10:41 UTC (rev 17426) @@ -0,0 +1,48 @@ +# +# $Id: Makefile 12796 2007-12-05 16:58:52Z sirdude $ +# +# * BEGIN GPL/BL DUAL LICENSE BLOCK * +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. The Blender +# Foundation also sells licenses for use in proprietary software under +# the Blender License. See http://www.blender.org/BL/ for information +# about this. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# * END GPL/BL DUAL LICENSE BLOCK * +# +# + +LIBNAME = nodes_tex +DIR = $(OCGDIR)/blender/$(LIBNAME) + +include nan_compile.mk + +CFLAGS += $(LEVEL_1_C_WARNINGS) + +CPPFLAGS += -I../../../blenkernel +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +CPPFLAGS += -I../../../makesdna +CPPFLAGS += -I../../../blenlib +CPPFLAGS += -I../../../include +CPPFLAGS += -I../../../imbuf +CPPFLAGS += -I../../../render/extern/include +CPPFLAGS += -I$(OPENGL_HEADERS) Added: trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c === --- trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c (rev 0) +++ trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c 2008-11-12 19:10:41 UTC (rev 17426) @@ -0,0 +1,123 @@ +/** + * + * * BEGIN GPL LICENSE BLOCK * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2005 Blender Foundation. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): none yet. + * + * * END GPL LICENSE BLOCK * + */ + +#include "../TEX_util.h" +#include + +static bNodeSocketType inputs[]=
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17425] trunk/blender/source: Patch #7897 Texture Nodes!
Revision: 17425 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17425 Author: ton Date: 2008-11-12 20:03:50 +0100 (Wed, 12 Nov 2008) Log Message: --- Patch #7897 Texture Nodes! Robin (Frrr) Allen did a decent job on this, so we can also welcome him as a member in the svn committers team to maintain it! I do the first commit with some minor fixes: - get Makefiles work - fix rounding issue with tiles on unit faces - removed UI includes from tex node A nice doc in wiki is here: http://wiki.blender.org/index.php/User:Frr/TexnodeManual On the todo for Robin is: - When using one or more Texture-input nodes, you cannot edit them by activating (as works now for Material nodes). - The new "output node" option fails on the default case, when only one output node is active. It then shows often a blank menu. Will get fixed asap. - When using a NodeTree-Texture as input node, the menu for 'active output' should not show. NodeTree should ignore other nodetrees to keep things sane for now. - On a future todo is proper usage of "Dxt" and "Dyt" texture vectors for superior antialising of checkers/bricks. General note; I know people are dying to get a full integrated shader system with nodes. In theory we could merge this with Material Nodetrees... but I rather wait for a solid and very well thought out design proposal for this, also including design ideas for unifying with a shader language (GPU, CPU). For the time being this is a nice extension of current textures. :) Modified Paths: -- trunk/blender/source/Makefile trunk/blender/source/blender/blenkernel/BKE_node.h trunk/blender/source/blender/blenkernel/intern/library.c trunk/blender/source/blender/blenkernel/intern/material.c trunk/blender/source/blender/blenkernel/intern/node.c trunk/blender/source/blender/blenkernel/intern/texture.c trunk/blender/source/blender/blenloader/intern/readfile.c trunk/blender/source/blender/blenloader/intern/writefile.c trunk/blender/source/blender/include/BSE_node.h trunk/blender/source/blender/include/blendef.h trunk/blender/source/blender/include/butspace.h trunk/blender/source/blender/makesdna/DNA_node_types.h trunk/blender/source/blender/makesdna/DNA_texture_types.h trunk/blender/source/blender/nodes/Makefile trunk/blender/source/blender/nodes/SConscript trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_texture.c trunk/blender/source/blender/nodes/intern/SHD_util.c trunk/blender/source/blender/render/extern/include/RE_shader_ext.h trunk/blender/source/blender/render/intern/include/pixelshading.h trunk/blender/source/blender/render/intern/include/texture.h trunk/blender/source/blender/render/intern/source/convertblender.c trunk/blender/source/blender/render/intern/source/pixelshading.c trunk/blender/source/blender/render/intern/source/rayshade.c trunk/blender/source/blender/render/intern/source/rendercore.c trunk/blender/source/blender/render/intern/source/texture.c trunk/blender/source/blender/src/butspace.c trunk/blender/source/blender/src/buttons_shading.c trunk/blender/source/blender/src/drawnode.c trunk/blender/source/blender/src/editnode.c trunk/blender/source/blender/src/header_node.c trunk/blender/source/blender/src/headerbuttons.c trunk/blender/source/blender/src/toolbox.c Modified: trunk/blender/source/Makefile === --- trunk/blender/source/Makefile 2008-11-12 16:04:14 UTC (rev 17424) +++ trunk/blender/source/Makefile 2008-11-12 19:03:50 UTC (rev 17425) @@ -97,6 +97,7 @@ COMLIB += $(OCGDIR)/blender/blenpluginapi/$(DEBUG_DIR)libblenpluginapi.a COMLIB += $(OCGDIR)/blender/nodes_shd/$(DEBUG_DIR)libnodes_shd.a COMLIB += $(OCGDIR)/blender/nodes_cmp/$(DEBUG_DIR)libnodes_cmp.a +COMLIB += $(OCGDIR)/blender/nodes_tex/$(DEBUG_DIR)libnodes_tex.a COMLIB += $(OCGDIR)/blender/nodes/$(DEBUG_DIR)libnodes.a COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a Modified: trunk/blender/source/blender/blenkernel/BKE_node.h === --- trunk/blender/source/blender/blenkernel/BKE_node.h 2008-11-12 16:04:14 UTC (rev 17424) +++ trunk/blender/source/blender/blenkernel/BKE_node.h 2008-11-12 19:03:50 UTC (rev 17425) @@ -47,6 +47,7 @@ struct ListBase; struct RenderData; struct Scene; +struct Tex; struct GPUMaterial; struct GPUNode; struct GPUNodeStack; @@ -118,6 +119,8 @@ #define NODE_CLASS_MATTE 9 #define NODE_CLASS_DISTORT 10 #define NODE_CLASS_OP_DYNAMIC 11 +#define NODE_CLASS_PATTERN 12 +#define NODE_CLASS_TEXTURE 13 /* ** GENERIC API, TREES *** */ @@ -377,6 +380,45 @@ void free_compbuf(struct CompBuf *cbuf); /* internal...*/ + +/* **
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17424] trunk/blender/config/ win32-mingw-config.py: set default path to the version that creates a working binary of Blender, when building with ming
Revision: 17424
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17424
Author: jesterking
Date: 2008-11-12 17:04:14 +0100 (Wed, 12 Nov 2008)
Log Message:
---
set default path to the version that creates a working binary of Blender, when
building with mingw. Now there is no need to do extra copying/config changing
Modified Paths:
--
trunk/blender/config/win32-mingw-config.py
Modified: trunk/blender/config/win32-mingw-config.py
===
--- trunk/blender/config/win32-mingw-config.py 2008-11-12 16:03:06 UTC (rev
17423)
+++ trunk/blender/config/win32-mingw-config.py 2008-11-12 16:04:14 UTC (rev
17424)
@@ -9,7 +9,7 @@
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
BF_PYTHON_LIB = 'python25'
-BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = False
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17423] trunk/lib/windows/python/lib/ lib25_vs2005/libpython25.a: add library to link against for mingw users
Revision: 17423 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17423 Author: jesterking Date: 2008-11-12 17:03:06 +0100 (Wed, 12 Nov 2008) Log Message: --- add library to link against for mingw users Added Paths: --- trunk/lib/windows/python/lib/lib25_vs2005/libpython25.a Added: trunk/lib/windows/python/lib/lib25_vs2005/libpython25.a === (Binary files differ) Property changes on: trunk/lib/windows/python/lib/lib25_vs2005/libpython25.a ___ Name: svn:mime-type + application/octet-stream ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17422] branches/animsys2/source/blender: AnimSys2: Current frame number indicator
Revision: 17422
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17422
Author: aligorith
Date: 2008-11-12 12:06:44 +0100 (Wed, 12 Nov 2008)
Log Message:
---
AnimSys2: Current frame number indicator
Added an (optional) frame number indicator beside the current frame indicator
(green line) in Action/NLA/IPO editors. This can be turned on/off from the View
menu. It draws as a green box containing the current frame number, and is
attached to the bottom indicator line.
Notes:
* The placement in the IPO Editor is still quite non-optimal
* The aim of this was to make it easier to see what frame is the current frame.
However, this may be too obstructive for some people.
Modified Paths:
--
branches/animsys2/source/blender/include/BDR_drawaction.h
branches/animsys2/source/blender/makesdna/DNA_action_types.h
branches/animsys2/source/blender/makesdna/DNA_space_types.h
branches/animsys2/source/blender/src/drawaction.c
branches/animsys2/source/blender/src/drawipo.c
branches/animsys2/source/blender/src/header_action.c
branches/animsys2/source/blender/src/header_ipo.c
branches/animsys2/source/blender/src/header_nla.c
Modified: branches/animsys2/source/blender/include/BDR_drawaction.h
===
--- branches/animsys2/source/blender/include/BDR_drawaction.h 2008-11-12
08:46:08 UTC (rev 17421)
+++ branches/animsys2/source/blender/include/BDR_drawaction.h 2008-11-12
11:06:44 UTC (rev 17422)
@@ -75,6 +75,7 @@
/* *** Methods ** */
/* Action Generics */
+void draw_cfra_number(float cfra);
void draw_cfra_action(void);
/* Channel Drawing */
Modified: branches/animsys2/source/blender/makesdna/DNA_action_types.h
===
--- branches/animsys2/source/blender/makesdna/DNA_action_types.h
2008-11-12 08:46:08 UTC (rev 17421)
+++ branches/animsys2/source/blender/makesdna/DNA_action_types.h
2008-11-12 11:06:44 UTC (rev 17422)
@@ -277,7 +277,9 @@
/* hack for moving pose-markers (temp flag) */
SACTION_POSEMARKERS_MOVE = (1<<6),
/* don't draw action channels using group colours (where
applicable) */
- SACTION_NODRAWGCOLORS = (1<<7)
+ SACTION_NODRAWGCOLORS = (1<<7),
+ /* don't draw current frame number beside frame indicator */
+ SACTION_NODRAWCFRANUM = (1<<8),
} SACTION_FLAG;
/* SpaceAction Mode Settings */
Modified: branches/animsys2/source/blender/makesdna/DNA_space_types.h
===
--- branches/animsys2/source/blender/makesdna/DNA_space_types.h 2008-11-12
08:46:08 UTC (rev 17421)
+++ branches/animsys2/source/blender/makesdna/DNA_space_types.h 2008-11-12
11:06:44 UTC (rev 17422)
@@ -544,6 +544,8 @@
#define SIPO_LOCK_VIEW (1<<0)
#define SIPO_NOTRANSKEYCULL(1<<1)
#define SIPO_NOHANDLES (1<<2)
+#define SIPO_NODRAWCFRANUM (1<<3)
+#define SIPO_DRAWTIME (1<<4)
/* SpaceText flags (moved from DNA_text_types.h) */
@@ -638,6 +640,7 @@
#define SNLA_ACTIVELAYERS 2
#define SNLA_DRAWTIME 4
#define SNLA_NOTRANSKEYCULL8
+#define SNLA_NODRAWCFRANUM 16
/* time->flag */
/* show timing in frames instead of in seconds */
Modified: branches/animsys2/source/blender/src/drawaction.c
===
--- branches/animsys2/source/blender/src/drawaction.c 2008-11-12 08:46:08 UTC
(rev 17421)
+++ branches/animsys2/source/blender/src/drawaction.c 2008-11-12 11:06:44 UTC
(rev 17422)
@@ -79,6 +79,7 @@
#include "BIF_gl.h"
#include "BIF_glutil.h"
#include "BIF_keyframing.h"
+#include "BIF_language.h"
#include "BIF_resources.h"
#include "BIF_screen.h"
#include "BIF_mywindow.h"
@@ -93,6 +94,7 @@
#include "BSE_drawview.h"
#include "BSE_editaction_types.h"
#include "BSE_editipo.h"
+#include "BSE_headerbuttons.h"
#include "BSE_time.h"
#include "BSE_view.h"
@@ -389,6 +391,65 @@
/** Current Frame
*/
+void draw_cfra_number(float cfra)
+{
+ float xscale, yscale, x, y;
+ short slen, time=0;
+ char str[32];
+
+ /* check if current spacetype allows drawing */
+ switch (curarea->spacetype) {
+ case SPACE_ACTION: /* action editor */
+ if (G.saction->flag & SACTION_NODRAWCFRANUM)
+ return;
+ else if (G.saction->flag & SACTION_DRAWTIME)
+ time= 1;
+ break;
+ case SPACE_NLA: /* nla editor */
+ if (G.snla->flag & SNLA_NODRAWCFRANUM)
+ return;
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17421] branches/animsys2/source/blender/ src/drawipo.c: AnimSys2: IPO Editor Handle Drawing
Revision: 17421
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17421
Author: aligorith
Date: 2008-11-12 09:46:08 +0100 (Wed, 12 Nov 2008)
Log Message:
---
AnimSys2: IPO Editor Handle Drawing
As an experiment, handle vertices in IPO Editor are now drawn as unfilled
circles. This is more in line with what other packages are doing, and is aimed
at making the handles more visibly different from the actual keyframes.
Comments are welcome on whether these contribute more visual clutter than
worth, any performance hits on more intensive shots, or OpenGL
incompatabilities (there shouldn't be issues, as other parts of Blender does
this too).
Modified Paths:
--
branches/animsys2/source/blender/src/drawipo.c
Modified: branches/animsys2/source/blender/src/drawipo.c
===
--- branches/animsys2/source/blender/src/drawipo.c 2008-11-12 07:48:53 UTC
(rev 17420)
+++ branches/animsys2/source/blender/src/drawipo.c 2008-11-12 08:46:08 UTC
(rev 17421)
@@ -1207,21 +1207,54 @@
bglEnd();
}
+/* helper func - draw handle vertex for an IPO-Curve as a round unfilled
circle */
+static void draw_ipohandle_control(float x, float y, float xscale, float
yscale, float hsize)
+{
+ static GLuint displist=0;
+
+ /* initialise round circle shape */
+ if (displist == 0) {
+ GLUquadricObj *qobj;
+
+ displist= glGenLists(1);
+ glNewList(displist, GL_COMPILE_AND_EXECUTE);
+
+ qobj= gluNewQuadric();
+ gluQuadricDrawStyle(qobj, GLU_SILHOUETTE);
+ gluDisk(qobj, 0.0, 0.8, 12, 1);
+ gluDeleteQuadric(qobj);
+
+ glEndList();
+ }
+
+ /* adjust view transform before starting */
+ glTranslatef(x, y, 0.0f);
+ glScalef(1.0/xscale*hsize, 1.0/yscale*hsize, 1.0);
+
+ /* draw! */
+ glCallList(displist);
+
+ /* restore view transform */
+ glScalef(xscale/hsize, yscale/hsize, 1.0);
+ glTranslatef(-x, -y, 0.0f);
+}
+
/* helper func - draw handle vertices only for an IPO-curve (if it is in
EditMode) */
static void draw_ipovertices_handles(IpoCurve *icu, short disptype, short sel)
{
BezTriple *bezt= icu->bezt;
BezTriple *prevbezt = NULL;
+ float hsize, xscale, yscale;
int a;
- /* Handles can be draw with different size to see them better */
- glPointSize(BIF_GetThemeValuef(TH_HANDLE_VERTEX_SIZE));
+ /* get view settings */
+ hsize= BIF_GetThemeValuef(TH_HANDLE_VERTEX_SIZE);
+ view2d_getscale(G.v2d, &xscale, &yscale);
/* set handle color */
if (sel) BIF_ThemeColor(TH_HANDLE_VERTEX_SELECT);
else BIF_ThemeColor(TH_HANDLE_VERTEX);
- bglBegin(GL_POINTS);
for (a= 0; a < icu->totvert; a++, prevbezt=bezt, bezt++) {
if (disptype != IPO_DISPBITS) {
if (ELEM(icu->ipo, IPO_BEZ, IPO_MIXED)) {
@@ -1232,22 +1265,16 @@
*/
if ( (!prevbezt && (bezt->ipo==IPO_BEZ)) ||
(prevbezt && (prevbezt->ipo==IPO_BEZ)) ) {
if ((bezt->f1 & SELECT) == sel)/* &&
G.v2d->cur.xmin < bezt->vec[0][0] < G.v2d->cur.xmax)*/
- bglVertex3fv(bezt->vec[0]);
+
draw_ipohandle_control(bezt->vec[0][0], bezt->vec[0][1], xscale, yscale, hsize);
}
if (bezt->ipo==IPO_BEZ) {
if ((bezt->f3 & SELECT) == sel)/* &&
G.v2d->cur.xmin < bezt->vec[2][0] < G.v2d->cur.xmax)*/
- bglVertex3fv(bezt->vec[2]);
+
draw_ipohandle_control(bezt->vec[2][0], bezt->vec[2][1], xscale, yscale, hsize);
}
}
}
}
- bglEnd();
-
- /* The color are always reset (see the while)
-* but the point size not so we reset now.
-*/
- glPointSize(BIF_GetThemeValuef(TH_VERTEX_SIZE));
}
static void draw_ipovertices(int sel)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
