[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18633] branches/blender2.5/blender/source /blender/editors/space_time/time_header.c: 2.5
Revision: 18633 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18633 Author: mfoxdogg Date: 2009-01-23 11:51:13 +0100 (Fri, 23 Jan 2009) Log Message: --- 2.5 * small commit, just added a couple missing notifiers to the timline buttons Modified Paths: -- branches/blender2.5/blender/source/blender/editors/space_time/time_header.c Modified: branches/blender2.5/blender/source/blender/editors/space_time/time_header.c === --- branches/blender2.5/blender/source/blender/editors/space_time/time_header.c 2009-01-23 03:52:52 UTC (rev 18632) +++ branches/blender2.5/blender/source/blender/editors/space_time/time_header.c 2009-01-23 10:51:13 UTC (rev 18633) @@ -369,6 +369,7 @@ break; case B_TL_REW: scene->r.cfra= PSFRA; + WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene); //update_for_newframe(); break; case B_TL_PLAY: @@ -380,6 +381,7 @@ case B_TL_FF: /* end frame */ scene->r.cfra= PEFRA; + WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene); //update_for_newframe(); break; case B_TL_PREVKEY: ___ 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 [18634] branches/blender2.5/blender/source /blender/editors/interface/view2d.c: fix for eternal loop that could happen when resizing the view.
Revision: 18634
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18634
Author: campbellbarton
Date: 2009-01-23 15:08:02 +0100 (Fri, 23 Jan 2009)
Log Message:
---
fix for eternal loop that could happen when resizing the view.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/interface/view2d.c
Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d.c
===
--- branches/blender2.5/blender/source/blender/editors/interface/view2d.c
2009-01-23 10:51:13 UTC (rev 18633)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d.c
2009-01-23 14:08:02 UTC (rev 18634)
@@ -1391,7 +1391,7 @@
grid->powerx= 1;
/* draw numbers in the appropriate range */
- if (dfac != 0.0f) {
+ if (dfac > 0.0f) {
for (; fac < hor.xmax; fac+=dfac,
val+=grid->dx) {
switch (vs->xunits) {
case V2D_UNIT_FRAMES:
/* frames (as whole numbers)*/
@@ -1523,7 +1523,7 @@
fac += 0.5f * dfac;
/* draw vertical steps */
- if (dfac != 0.0f) {
+ if (dfac > 0.0f) {
for (; fac < vert.ymax; fac+= dfac, val +=
grid->dy) {
scroll_printstr(vs, scene,
(float)(vert.xmax)-14.0f, fac, val, grid->powery, vs->yunits, 'v');
}
___
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 [18635] branches/blender2.5/blender/source /blender: 2.5
Revision: 18635
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18635
Author: ton
Date: 2009-01-23 15:43:25 +0100 (Fri, 23 Jan 2009)
Log Message:
---
2.5
Font object + editing back.
Was quite some work due to a myriad of globals all over!
Works nicely 100% local now.
To enable a single textedit operator, I've added a new
keymap entry KM_TEXTEDIT, which gives all keyboard events
to the handler. Also had to add a new keymap-add function
to force a keymap handler in beginning of region handlers.
In future this can be used to prioritize handlers.
Also: split off the arrow keys (frame change) to a separate
region level handler. Can be set with default flag in
regiontype->keymapflag ED_KEYMAP_FRAMES
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_curve.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_font.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h
branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c
branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c
branches/blender2.5/blender/source/blender/blenkernel/intern/font.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/include/ED_curve.h
branches/blender2.5/blender/source/blender/editors/include/ED_screen.h
branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/editors/space_action/space_action.c
branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
branches/blender2.5/blender/source/blender/editors/space_buttons/space_buttons.c
branches/blender2.5/blender/source/blender/editors/space_image/space_image.c
branches/blender2.5/blender/source/blender/editors/space_ipo/space_ipo.c
branches/blender2.5/blender/source/blender/editors/space_nla/space_nla.c
branches/blender2.5/blender/source/blender/editors/space_node/space_node.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/space_sequencer.c
branches/blender2.5/blender/source/blender/editors/space_sound/space_sound.c
branches/blender2.5/blender/source/blender/editors/space_time/space_time.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c
branches/blender2.5/blender/source/blender/makesdna/DNA_curve_types.h
branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
branches/blender2.5/blender/source/blender/windowmanager/WM_types.h
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/blender2.5/blender/source/blender/windowmanager/wm_event_types.h
Added Paths:
---
branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h
branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c
branches/blender2.5/blender/source/blender/editors/curve/editfont.c
branches/blender2.5/blender/source/blender/editors/curve/lorem.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_curve.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_curve.h
2009-01-23 14:08:02 UTC (rev 18634)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_curve.h
2009-01-23 14:43:25 UTC (rev 18635)
@@ -49,6 +49,7 @@
void unlink_curve( struct Curve *cu);
void free_curve( struct Curve *cu);
+void BKE_free_editfont(struct Curve *cu);
struct Curve *add_curve(char *name, int type);
struct Curve *copy_curve( struct Curve *cu);
void make_local_curve( struct Curve *cu);
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_font.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_font.h
2009-01-23 14:08:02 UTC (rev 18634)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_font.h
2009-01-23 14:43:25 UTC (rev 18635)
@@ -43,6 +43,7 @@
struct Curve;
struct objfnt;
struct TmpFont;
+struct CharInfo;
struct chartrans {
float xof, yof;
@@ -55,20 +56,31 @@
float x, y, w, h;
} SelBox;
-extern struct SelBox *selboxes;
+typedef struct EditFont {
+ wchar_t *copybuf;
+ wchar_t *copybufinfo;
+
+ wchar_t *textbuf;
+ struct CharInfo *textbufinfo;
+ wchar_t *oldstr;
+ struct CharInfo *oldstrinfo;
+
+ float textcurs[4][2];
+
+} Ed
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18636] branches/blender2.5/blender/source /blender: 2.5
Revision: 18636
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18636
Author: ton
Date: 2009-01-23 18:42:36 +0100 (Fri, 23 Jan 2009)
Log Message:
---
2.5
File reading of 2.50 files fixed.
- it now exits nicely from queues without using free'd memory
(checks CTX_wm_window(C) to be NULL)
- code that matched current (ghost) window with new situation
lacked setting a pointer good.
Overall cleaned some parts too; like context clears now all
wm related pointers when you set a new wm, window or area.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/intern/context.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/context.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/context.c
2009-01-23 14:43:25 UTC (rev 18635)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/context.c
2009-01-23 17:42:36 UTC (rev 18636)
@@ -197,6 +197,10 @@
void CTX_wm_manager_set(bContext *C, wmWindowManager *wm)
{
C->wm.manager= wm;
+ C->wm.window= NULL;
+ C->wm.screen= NULL;
+ C->wm.area= NULL;
+ C->wm.region= NULL;
}
void CTX_wm_window_set(bContext *C, wmWindow *win)
@@ -204,17 +208,22 @@
C->wm.window= win;
C->wm.screen= (win)? win->screen: NULL;
C->data.scene= (C->wm.screen)? C->wm.screen->scene: NULL;
+ C->wm.area= NULL;
+ C->wm.region= NULL;
}
void CTX_wm_screen_set(bContext *C, bScreen *screen)
{
C->wm.screen= screen;
C->data.scene= (C->wm.screen)? C->wm.screen->scene: NULL;
+ C->wm.area= NULL;
+ C->wm.region= NULL;
}
void CTX_wm_area_set(bContext *C, ScrArea *area)
{
C->wm.area= area;
+ C->wm.region= NULL;
}
void CTX_wm_region_set(bContext *C, ARegion *region)
Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm.c
===
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm.c
2009-01-23 14:43:25 UTC (rev 18635)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm.c
2009-01-23 17:42:36 UTC (rev 18636)
@@ -100,7 +100,7 @@
wmWindowManager *wm= CTX_wm_manager(C);
/* wm context */
- if(CTX_wm_manager(C)==NULL) {
+ if(wm==NULL) {
wm= CTX_data_main(C)->wm.first;
CTX_wm_manager_set(C, wm);
}
@@ -118,6 +118,8 @@
ED_screens_initialize(wm);
wm->initialized= 1;
+
+ WM_event_add_notifier(C, NC_WINDOW, NULL);
}
}
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
===
---
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-01-23 14:43:25 UTC (rev 18635)
+++
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-01-23 17:42:36 UTC (rev 18636)
@@ -135,6 +135,9 @@
wmNotifier *note;
wmWindow *win;
+ if(wm==NULL)
+ return;
+
/* cache & catch WM level notifiers, such as frame change */
/* XXX todo, multiwindow scenes */
for(win= wm->windows.first; win; win= win->next) {
@@ -194,7 +197,6 @@
ED_area_do_refresh(C, sa);
}
}
- CTX_wm_area_set(C, NULL);
}
CTX_wm_window_set(C, NULL);
}
@@ -686,6 +688,9 @@
break;
}
+ /* fileread case */
+ if(CTX_wm_window(C)==NULL)
+ break;
}
return action;
}
@@ -794,6 +799,12 @@
action= wm_handlers_do(C, event, &win->handlers);
+ /* fileread case */
+ if(CTX_wm_window(C)==NULL) {
+ wm_event_free(event);
+ break;
+ }
+
if(wm_event_always_pass(event) ||
action==WM_HANDLER_CONTINUE) {
ScrArea *sa;
ARegion *ar;
@@ -843,6 +854,10 @@
CTX_wm_area_set(C, NU
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18637] branches/blender2.5/blender/source /blender: 2.5: multiple small fixes
Revision: 18637
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18637
Author: blendix
Date: 2009-01-23 21:36:47 +0100 (Fri, 23 Jan 2009)
Log Message:
---
2.5: multiple small fixes
- wm draw method is now initialized correct when reading older
files, but the SDNA bug causing the problem is still unsolved.
is due to // char pad[8]; not being recognized as commented.
- triple buffer proxy texture test follows spec better now,
was disabling triple buffer unnecessarily on some drivers.
- some cmake compile fixes related to sequencer pthread usage
and removed bad level calls lib for player.
- show outliner header buttons in oops mode as well until that
can be switched in the UI.
- fix region data free issue for tooltips
- warning fixes
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_mesh.h
branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
branches/blender2.5/blender/source/blender/blenlib/intern/arithb.c
branches/blender2.5/blender/source/blender/blenlib/intern/graph.c
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/blender2.5/blender/source/blender/gpu/GPU_draw.h
branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_constraint.c
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_draw.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_mesh.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_mesh.h
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_mesh.h
2009-01-23 20:36:47 UTC (rev 18637)
@@ -39,6 +39,7 @@
struct MDeformVert;
struct Mesh;
struct MFace;
+struct MEdge;
struct MVert;
struct MCol;
struct Object;
Modified: branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
===
--- branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
2009-01-23 20:36:47 UTC (rev 18637)
@@ -56,18 +56,12 @@
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
-IF(WITH_PLAYER)
- SUBDIRS(bad_level_call_stubs)
-ENDIF(WITH_PLAYER)
-
IF(WITH_PYTHON)
SET(INC ${INC} ../python ${PYTHON_INC})
ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON)
-BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")
-
IF(WITH_INTERNATIONAL)
ADD_DEFINITIONS(-DWITH_FREETYPE2)
ENDIF(WITH_INTERNATIONAL)
@@ -75,3 +69,10 @@
IF(NOT WITH_ELBEEM)
ADD_DEFINITIONS(-DDISABLE_ELBEEM)
ENDIF(NOT WITH_ELBEEM)
+
+IF(WIN32)
+ SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
+BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")
+
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2009-01-23 20:36:47 UTC (rev 18637)
@@ -2387,7 +2387,7 @@
static void write_videoscape_mesh(Scene *scene, Object *ob, char *str)
{
- Mesh *me;
+ Mesh *me= ob->data;
EditMesh *em = me->edit_mesh;
Material *ma;
MFace *mface;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
2009-01-23 17:42:36 UTC (rev 18636)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
2009-01-23 20:36:47 UTC (rev 18637)
@@ -215,7 +215,7 @@
/*first check if the array buffer size has room*/
/*if newlen is 200 chars less then totallen, reallocate anyway*/
if (newlen <= prop->totallen && prop->totallen - newlen < 200) {
- idp_resize_group_array(prop, newlen, newarr);
+ idp_resize_group_array(prop, newlen, prop->data.pointer);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18638] trunk/blender: [#18164] jpeg2000 patch, with some fixes from Peter too.
Revision: 18638
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18638
Author: campbellbarton
Date: 2009-01-23 22:08:01 +0100 (Fri, 23 Jan 2009)
Log Message:
---
[#18164] jpeg2000 patch, with some fixes from Peter too.
Support for jpeg2000 and writing DCI Cinema standard files.
Notes
* 12 and 16bit channel depths are converted from/to blenders float buffer.
* Grayscale/RGB with alpha supported.
* Theres an option to save color channels as YCC rather then RGB.
* Quality 100 saves lossless
* The UI is a bit weired because of the DCI standards need to be given to the
encoder.
Modified Paths:
--
trunk/blender/config/irix6-config.py
trunk/blender/config/linux2-config.py
trunk/blender/config/win32-vc-config.py
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenpluginapi/iff.h
trunk/blender/source/blender/imbuf/IMB_imbuf_types.h
trunk/blender/source/blender/imbuf/intern/readimage.c
trunk/blender/source/blender/imbuf/intern/util.c
trunk/blender/source/blender/imbuf/intern/writeimage.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/src/SConscript
trunk/blender/source/blender/src/buttons_scene.c
trunk/blender/source/blender/src/filelist.c
trunk/blender/source/blender/src/writeimage.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/config/irix6-config.py
===
--- trunk/blender/config/irix6-config.py2009-01-23 20:36:47 UTC (rev
18637)
+++ trunk/blender/config/irix6-config.py2009-01-23 21:08:01 UTC (rev
18638)
@@ -159,7 +159,7 @@
WITH_BF_OPENJPEG = 'false'
BF_OPENJPEG = '#extern/libopenjpeg'
BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
WITH_BF_REDCODE = 'false'
Modified: trunk/blender/config/linux2-config.py
===
--- trunk/blender/config/linux2-config.py 2009-01-23 20:36:47 UTC (rev
18637)
+++ trunk/blender/config/linux2-config.py 2009-01-23 21:08:01 UTC (rev
18638)
@@ -157,7 +157,7 @@
WITH_BF_OPENJPEG = True
BF_OPENJPEG = '#extern/libopenjpeg'
BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
WITH_BF_REDCODE = False
Modified: trunk/blender/config/win32-vc-config.py
===
--- trunk/blender/config/win32-vc-config.py 2009-01-23 20:36:47 UTC (rev
18637)
+++ trunk/blender/config/win32-vc-config.py 2009-01-23 21:08:01 UTC (rev
18638)
@@ -153,6 +153,10 @@
BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
WITH_BF_OPENJPEG = True
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
WITH_BF_REDCODE = False
BF_REDCODE_INC = '#extern'
Modified: trunk/blender/source/blender/blenkernel/SConscript
===
--- trunk/blender/source/blender/blenkernel/SConscript 2009-01-23 20:36:47 UTC
(rev 18637)
+++ trunk/blender/source/blender/blenkernel/SConscript 2009-01-23 21:08:01 UTC
(rev 18638)
@@ -42,6 +42,9 @@
if env['WITH_BF_OPENEXR']:
defs += ' WITH_OPENEXR'
+if env['WITH_BF_OPENJPEG']:
+defs += ' WITH_OPENJPEG'
+
if env['WITH_BF_DDS']:
defs += ' WITH_DDS'
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===
--- trunk/blender/source/blender/blenkernel/intern/image.c 2009-01-23
20:36:47 UTC (rev 18637)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2009-01-23
21:08:01 UTC (rev 18638)
@@ -767,6 +767,10 @@
return RAWTGA;
else if(imtype==R_HAMX)
return AN_hamx;
+#ifdef WITH_OPENJPEG
+ else if(imtype==R_JP2)
+ return JP2;
+#endif
else
return JPG|90;
}
@@ -801,6 +805,10 @@
return R_RAWTGA;
else if(ftype == AN_hamx)
return R_HAMX;
+#ifdef WITH_OPENJPEG
+ else if(ftype & JP2)
+ return R_JP2;
+#endif
else
return R_JPEG90;
}
@@ -877,6 +885,12 @@
if(!BLI_testextensie(string, ".tga"))
extension= ".tga";
}
+#ifdef WITH_OPENJPEG
+ else if(imtype==R_JP2) {
+ if(!BLI_testextensie(string, ".jp2"))
+ extension= ".jp2";
+ }
+#endif
else { // R_MOVIE, R_AVICODEC, R_AVIRAW, R_AVIJPEG, R_JPEG90,
R_QUICKTIME etc
if(!( BLI_testextensie(string, ".jpg") ||
BLI_testextensie(string,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18639] branches/etch-a-ton/source/blender /src/editarmature_sketch.c: Prevent overdrawing to trigger when starting a stroke by snapping to an existin
Revision: 18639
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18639
Author: theeth
Date: 2009-01-23 22:34:51 +0100 (Fri, 23 Jan 2009)
Log Message:
---
Prevent overdrawing to trigger when starting a stroke by snapping to an
existing point.
Overdrawing copies point type from start and end point (better for polyline)
misc renaming some structs and vars (cleanup mostly)
Modified Paths:
--
branches/etch-a-ton/source/blender/src/editarmature_sketch.c
Modified: branches/etch-a-ton/source/blender/src/editarmature_sketch.c
===
--- branches/etch-a-ton/source/blender/src/editarmature_sketch.c
2009-01-23 21:08:01 UTC (rev 18638)
+++ branches/etch-a-ton/source/blender/src/editarmature_sketch.c
2009-01-23 21:34:51 UTC (rev 18639)
@@ -92,14 +92,14 @@
int selected;
} SK_Stroke;
-#define SK_ADJUST_LIMIT5
+#define SK_OVERDRAW_LIMIT 5
-typedef struct SK_Adjustment
+typedef struct SK_Overdraw
{
SK_Stroke *target;
int start, end;
int count;
-} SK_Adjustment;
+} SK_Overdraw;
#define SK_Stroke_BUFFER_INIT_SIZE 20
@@ -127,7 +127,7 @@
SK_Stroke *active_stroke;
SK_Stroke *gesture;
SK_Pointnext_point;
- SK_Adjustment adj;
+ SK_Overdraw over;
} SK_Sketch;
typedef struct SK_StrokeIterator {
@@ -203,8 +203,8 @@
void sk_applyConvertGesture(SK_Gesture *gest, SK_Sketch *sketch);
-void sk_resetAdjust(SK_Sketch *sketch);
-int sk_hasAdjust(SK_Sketch *sketch, SK_Stroke *stk);
+void sk_resetOverdraw(SK_Sketch *sketch);
+int sk_hasOverdraw(SK_Sketch *sketch, SK_Stroke *stk);
/ GESTURE ACTIONS **/
@@ -1065,7 +1065,7 @@
{
if (sketch->active_stroke != NULL)
{
- sk_resetAdjust(sketch);
+ sk_resetOverdraw(sketch);
sk_removeStroke(sketch, sketch->active_stroke);
}
}
@@ -1407,30 +1407,36 @@
return pt;
}
-void sk_resetAdjust(SK_Sketch *sketch)
+void sk_resetOverdraw(SK_Sketch *sketch)
{
- sketch->adj.target = NULL;
- sketch->adj.start = -1;
- sketch->adj.end = -1;
- sketch->adj.count = 0;
+ sketch->over.target = NULL;
+ sketch->over.start = -1;
+ sketch->over.end = -1;
+ sketch->over.count = 0;
}
-int sk_hasAdjust(SK_Sketch *sketch, SK_Stroke *stk)
+int sk_hasOverdraw(SK_Sketch *sketch, SK_Stroke *stk)
{
- return sketch->adj.target &&
- sketch->adj.count >= SK_ADJUST_LIMIT &&
- (sketch->adj.target == stk || stk == NULL) &&
- (sketch->adj.start != -1 || sketch->adj.end != -1);
+ return sketch->over.target &&
+ sketch->over.count >= SK_OVERDRAW_LIMIT &&
+ (sketch->over.target == stk || stk == NULL) &&
+ (sketch->over.start != -1 || sketch->over.end != -1);
}
-void sk_updateAdjust(SK_Sketch *sketch, SK_Stroke *stk, SK_DrawData *dd)
+void sk_updateOverdraw(SK_Sketch *sketch, SK_Stroke *stk, SK_DrawData *dd)
{
- if (sketch->adj.target == NULL)
+ if (sketch->over.target == NULL)
{
SK_Stroke *target;
int closest_index = -1;
int dist = SNAP_MIN_DISTANCE * 2;
+ /* If snapping, don't start overdraw */
+ if (sk_lastStrokePoint(stk)->mode == PT_SNAP)
+ {
+ return;
+ }
+
for (target = sketch->strokes.first; target; target =
target->next)
{
if (target != stk)
@@ -1441,60 +1447,60 @@
if (spt != NULL)
{
- sketch->adj.target = target;
+ sketch->over.target = target;
closest_index = index;
}
}
}
- if (sketch->adj.target != NULL)
+ if (sketch->over.target != NULL)
{
if (closest_index > -1)
{
if (sk_lastStrokePoint(stk)->type == PT_EXACT)
{
- sketch->adj.count = SK_ADJUST_LIMIT;
+ sketch->over.count = SK_OVERDRAW_LIMIT;
}
else
{
- sketch->adj.count++;
+ sketch->over.count++;
}
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18640] branches/blender2.5/blender/source /blender/blenkernel/intern: Animato - More compatability work
Revision: 18640
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18640
Author: aligorith
Date: 2009-01-24 00:11:12 +0100 (Sat, 24 Jan 2009)
Log Message:
---
Animato - More compatability work
* Absolute shapekeys work again. For now, the 'speed' curve isn't converted yet
(same goes for 'Curves'). Those were kindof hacky, since they manipulated time
in weird ways. Probably the clamping to 0.0-1.0 range can go though.
* Materials, Textures, Cameras, and local-constraint IPO's are now converted
properly to the new system
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
branches/blender2.5/blender/source/blender/blenkernel/intern/key.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
2009-01-23 21:34:51 UTC (rev 18639)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
2009-01-23 23:11:12 UTC (rev 18640)
@@ -344,6 +344,105 @@
return NULL;
}
+/* Material Types */
+static char *material_adrcodes_to_paths (int adrcode, int *array_index)
+{
+ /* set array index like this in-case nothing sets it correctly */
+ *array_index= 0;
+
+ /* result depends on adrcode */
+ switch (adrcode) {
+ case MA_COL_R:
+ *array_index= 0; return "diffuse_color";
+ case MA_COL_G:
+ *array_index= 1; return "diffuse_color";
+ case MA_COL_B:
+ *array_index= 2; return "diffuse_color";
+
+ case MA_SPEC_R:
+ *array_index= 0; return "specular_color";
+ case MA_SPEC_G:
+ *array_index= 1; return "specular_color";
+ case MA_SPEC_B:
+ *array_index= 2; return "specular_color";
+
+ case MA_MIR_R:
+ *array_index= 0; return "mirror_color";
+ case MA_MIR_G:
+ *array_index= 1; return "mirror_color";
+ case MA_MIR_B:
+ *array_index= 2; return "mirror_color";
+
+ case MA_ALPHA:
+ return "alpha";
+
+ case MA_REF:
+ return "diffuse_reflection";
+
+ // XXX add other types...
+ }
+
+ return NULL;
+
+#if 0
+ case MA_EMIT:
+ poin= &(ma->emit); break;
+ case MA_AMB:
+ poin= &(ma->amb); break;
+ case MA_SPEC:
+ poin= &(ma->spec); break;
+ case MA_HARD:
+ poin= &(ma->har); *type= IPO_SHORT; break;
+ case MA_SPTR:
+ poin= &(ma->spectra); break;
+ case MA_IOR:
+ poin= &(ma->ang); break;
+ case MA_MODE:
+ poin= &(ma->mode); *type= IPO_INT_BIT; break; // evil...
dumping bitflags directly to user!
+ case MA_HASIZE:
+ poin= &(ma->hasize); break;
+ case MA_TRANSLU:
+ poin= &(ma->translucency); break;
+ case MA_RAYM:
+ poin= &(ma->ray_mirror); break;
+ case MA_FRESMIR:
+ poin= &(ma->fresnel_mir); break;
+ case MA_FRESMIRI:
+ poin= &(ma->fresnel_mir_i); break;
+ case MA_FRESTRA:
+ poin= &(ma->fresnel_tra); break;
+ case MA_FRESTRAI:
+ poin= &(ma->fresnel_tra_i); break;
+ case MA_ADD:
+ poin= &(ma->add); break;
+
+ if (poin == NULL) {
+ if (icu->adrcode & MA_MAP1) mtex= ma->mtex[0];
+ else if (icu->adrcode & MA_MAP2) mtex= ma->mtex[1];
+ else if (icu->adrcode & MA_MAP3) mtex= ma->mtex[2];
+ else if (icu->adrcode & MA_MAP4) mtex= ma->mtex[3];
+ else if (icu->adrcode & MA_MAP5) mtex= ma->mtex[4];
+ else if (icu->adrcode & MA_MAP6) mtex= ma->mtex[5];
+ else if (icu->adrcode & MA_MAP7) mtex= ma->mtex[6];
+ else if (icu->adrcode & MA_MAP8) mtex= ma->mtex[7];
+ else if (icu->adrcode & MA_MAP9) mtex= ma->mtex[8];
+ else if (icu->adrcode & MA_MAP10) mtex= ma->mtex[9];
+ else if (icu->adrcode & MA_MAP12) mtex= ma->mtex[11];
+ else if (icu->adrcode & MA_MAP11) mtex= ma->mtex[10];
+ else if (icu->adrcode & MA_MAP13) mtex= ma->mtex[12];
+ else if (icu->adrcode & MA_MAP14) mtex= ma->mtex[13];
+ else if (icu->adrcode & MA_MAP15) mtex= ma->mtex[14];
+ else if (icu->adrcode & MA_MAP16) mtex= ma->mtex[15];
+ else if (icu->adrcode & MA_MAP17) mtex= ma->m
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18641] branches/blender2.5/blender/source /blender: * operators for toggling, making, separating metastrip's.
Revision: 18641
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18641
Author: campbellbarton
Date: 2009-01-24 00:14:02 +0100 (Sat, 24 Jan 2009)
Log Message:
---
* operators for toggling, making, separating metastrip's. (tab, m, alt+m)
* transform support for metastrips
* active strip is set to NULL if its freed again.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_sequence.h
branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_intern.h
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_ops.c
branches/blender2.5/blender/source/blender/editors/transform/transform.c
branches/blender2.5/blender/source/blender/editors/transform/transform.h
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_sequence.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_sequence.h
2009-01-23 23:11:12 UTC (rev 18640)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_sequence.h
2009-01-23 23:14:02 UTC (rev 18641)
@@ -137,7 +137,7 @@
/* sequence.c */
// extern
-void seq_free_sequence(struct Sequence *seq);
+void seq_free_sequence(struct Editing *ed, struct Sequence *seq);
void seq_free_strip(struct Strip *strip);
void seq_free_editing(struct Editing *ed);
char *give_seqname(struct Sequence *seq);
@@ -175,5 +175,7 @@
void seq_tx_set_final_left(struct Sequence *seq, int val);
void seq_tx_set_final_right(struct Sequence *seq, int val);
void seq_tx_handle_xlimits(struct Sequence *seq, int leftflag, int rightflag);
+int seq_tx_test(struct Sequence * seq);
int check_single_seq(struct Sequence *seq);
void fix_single_seq(struct Sequence *seq);
+
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c
2009-01-23 23:11:12 UTC (rev 18640)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c
2009-01-23 23:14:02 UTC (rev 18641)
@@ -165,10 +165,8 @@
MEM_freeN(strip);
}
-void seq_free_sequence(Sequence *seq)
+void seq_free_sequence(Editing *ed, Sequence *seq)
{
- //XXX Sequence *last_seq = get_last_seq();
-
if(seq->strip) seq_free_strip(seq->strip);
if(seq->anim) IMB_free_anim(seq->anim);
@@ -180,7 +178,8 @@
sh.free(seq);
}*/
- //XXX if(seq==last_seq) set_last_seq(NULL);
+ if (ed->act_seq==seq)
+ ed->act_seq= NULL;
MEM_freeN(seq);
}
@@ -194,7 +193,7 @@
return;
SEQ_BEGIN(ed, seq) {
- seq_free_sequence(seq);
+ seq_free_sequence(ed, seq);
}
SEQ_END
@@ -3192,4 +3191,9 @@
seq_tx_set_final_right( seq, seq_tx_get_final_right(seq, 0) -
offset );
seq->start += offset;
}
-}
\ No newline at end of file
+}
+
+int seq_tx_test(Sequence * seq)
+{
+ return (seq->type < SEQ_EFFECT) ||
(get_sequence_effect_num_inputs(seq->type) == 0);
+}
Modified:
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
===
---
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
2009-01-23 23:11:12 UTC (rev 18640)
+++
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
2009-01-23 23:14:02 UTC (rev 18641)
@@ -747,7 +747,7 @@
if(newseq->plugin==0) {
BLI_remlink(ed->seqbasep, newseq);
- seq_free_sequence(newseq);
+ seq_free_sequence(ed, newseq);
set_last_seq(scene, NULL);
return 0;
}
Modified:
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===
---
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2009-01-23 23:11:12 UTC (rev 18640)
+++
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2009-01-23 23:14:02 UTC (rev 18641)
@@ -64,6 +64,7 @@
#include "BKE_sequence.h"
#include "BKE_scene.h"
#include "BKE_utildefines.h"
+#include "BKE_report.h"
#include "BIF_gl.h"
#include "BIF_glutil.h"
@@ -252,7 +253,7 @@
error("There
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18642] branches/blender2.5/blender/source /blender/editors: added back extend (Ekey) to sequener transform, works with nested metastrips too.
Revision: 18642
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18642
Author: campbellbarton
Date: 2009-01-24 06:38:25 +0100 (Sat, 24 Jan 2009)
Log Message:
---
added back extend (Ekey) to sequener transform, works with nested metastrips
too.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/blender2.5/blender/source/blender/editors/transform/transform.h
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===
---
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2009-01-23 23:14:02 UTC (rev 18641)
+++
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2009-01-24 05:38:25 UTC (rev 18642)
@@ -2336,7 +2336,6 @@
static int sequencer_cut_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
- Scene *scene= CTX_data_scene(C);
ARegion *ar= CTX_wm_region(C);
View2D *v2d= UI_view2d_fromcontext(C);
Modified:
branches/blender2.5/blender/source/blender/editors/transform/transform.h
===
--- branches/blender2.5/blender/source/blender/editors/transform/transform.h
2009-01-23 23:14:02 UTC (rev 18641)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform.h
2009-01-24 05:38:25 UTC (rev 18642)
@@ -154,6 +154,7 @@
typedef struct TransDataSeq {
struct Sequence *seq;
int flag; /* a copy of seq->flag that may be modified for
nested strips */
+ short start_offset; /* use this so we can have transform data at the
strips start, but apply correctly to the start frame */
short sel_flag; /* one of SELECT, SEQ_LEFTSEL and SEQ_RIGHTSEL */
} TransDataSeq;
@@ -219,6 +220,7 @@
short imval[2]; /* initial mouse position */
short idx_max;/* maximum index on the input vector
*/
float snap[3];/* Snapping Gears
*/
+ charframe_side; /* Mouse side of the cfra, 'L',
'R' or 'B' */
float viewmat[4][4]; /* copy from G.vd, prevents feedback,
*/
float viewinv[4][4]; /* and to make sure we don't have to
*/
Modified:
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
===
---
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
2009-01-23 23:14:02 UTC (rev 18641)
+++
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
2009-01-24 05:38:25 UTC (rev 18642)
@@ -2324,15 +2324,10 @@
seq= tdsq->seq;
new_frame= (int)(td2d->loc[0] + 0.5f);
- /* TODO, only use seq flags for non nested strips
-* seq_tx_handle_xlimits used below is only correct when your
not using metastrips.
-* meta children should ignore those flags
-*/
-
switch (tdsq->sel_flag) {
case SELECT:
if (seq->type != SEQ_META) /* for meta's, their
children move */
- seq->start= new_frame;
+ seq->start= new_frame - tdsq->start_offset;
if (seq->depth==0) {
seq->machine= (int)(td2d->loc[1] + 0.5f);
@@ -2364,6 +2359,17 @@
}
seq_prev= seq;
}
+
+ if (t->mode == TFM_TIME_TRANSLATE) { /* originally TFM_TIME_EXTEND,
transform changes */
+ /* Special annoying case here, need to calc metas with
TFM_TIME_EXTEND only */
+ seq= ((Editing *)t->scene->ed)->seqbasep->first;
+
+ while(seq) {
+ if (seq->type == SEQ_META && seq->flag & SELECT)
+ calc_sequence(seq);
+ seq= seq->next;
+ }
+ }
}
/* * UV ** */
@@ -3050,7 +3056,7 @@
float xmouse, ymouse;
UI_view2d_region_to_view(&ac.ar->v2d, t->imval[0], t->imval[1],
&xmouse, &ymouse);
- side = (xmouse > CFRA) ? 'R' : 'L';
+ side = (xmouse > CFRA) ? 'R' : 'L'; // XXX use t->frame_side
}
else {
/* normal transform - both sides of current frame are
considered */
@@ -3292,59 +3298,107 @@
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18643] branches/blender2.5/blender/source /blender/editors/space_sequencer/sequencer_edit.c: Added back a line removed in r18642 so the macro CFRA ca
Revision: 18643
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18643
Author: nicholasbishop
Date: 2009-01-24 07:08:46 +0100 (Sat, 24 Jan 2009)
Log Message:
---
Added back a line removed in r18642 so the macro CFRA can access scene.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===
---
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2009-01-24 05:38:25 UTC (rev 18642)
+++
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2009-01-24 06:08:46 UTC (rev 18643)
@@ -2336,6 +2336,7 @@
static int sequencer_cut_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
+ Scene *scene = CTX_data_scene(C);
ARegion *ar= CTX_wm_region(C);
View2D *v2d= UI_view2d_fromcontext(C);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
