[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18712] branches/blender2.5/blender/source /blender/editors: Graph Editor: Restoring most tools
Revision: 18712
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18712
Author: aligorith
Date: 2009-01-28 10:55:36 +0100 (Wed, 28 Jan 2009)
Log Message:
---
Graph Editor: Restoring most tools
* Copy/Paste still needs to be cleaned up to be functional. Auto-set preview
range + View All also need some work to become functional...
* Smooth has been moved to Alt-O hotkey, as Shift-O was taken for Sample
* Renamed a few operators for DopeSheet to be more in line with Graph Editor
ones, and to be less obscure.
* The 'join' and 'remove doubles' tools are not likely to be restored. I think
that a few of the new tools cover this lack anyway. We can restore them if
there is a real need.
* Record tool needs a rethink to be genuinely useful, so it's not included here
anymore.
A note for anyone wanting to play with implementing this: store the sampled
points using the new FPoint type in the FCurve instead of using BezTriples, as
FPoints are used for storing sampled/baked data.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c
branches/blender2.5/blender/source/blender/editors/include/ED_keyframes_edit.h
branches/blender2.5/blender/source/blender/editors/space_action/action_edit.c
branches/blender2.5/blender/source/blender/editors/space_action/action_intern.h
branches/blender2.5/blender/source/blender/editors/space_action/action_ops.c
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_edit.c
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_intern.h
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_ops.c
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c
Modified:
branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c
===
---
branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c
2009-01-28 09:32:31 UTC (rev 18711)
+++
branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c
2009-01-28 09:55:36 UTC (rev 18712)
@@ -152,11 +152,6 @@
/* */
/* Various Tools */
-// XXX - stub... until keyframing code is fixed...
-static void insert_vert_fcu(FCurve *fcu, float x, float y, short flag)
-{
-}
-
/* Basic IPO-Curve 'cleanup' function that removes 'double points' and
unnecessary keyframes on linear-segments only */
void clean_fcurve(FCurve *fcu, float thresh)
{
@@ -176,7 +171,7 @@
/* now insert first keyframe, as it should be ok */
bezt = old_bezts;
- insert_vert_fcu(fcu, bezt-vec[1][0], bezt-vec[1][1], 0);
+ insert_vert_fcurve(fcu, bezt-vec[1][0], bezt-vec[1][1], 0);
/* Loop through BezTriples, comparing them. Skip any that do
* not fit the criteria for ok points.
@@ -213,7 +208,7 @@
if (cur[1] next[1]) {
if (IS_EQT(cur[1], prev[1], thresh) ==
0) {
/* add new keyframe */
- insert_vert_fcu(fcu, cur[0],
cur[1], 0);
+ insert_vert_fcurve(fcu, cur[0],
cur[1], 0);
}
}
}
@@ -221,7 +216,7 @@
/* only add if values are a considerable
distance apart */
if (IS_EQT(cur[1], prev[1], thresh) == 0) {
/* add new keyframe */
- insert_vert_fcu(fcu, cur[0], cur[1], 0);
+ insert_vert_fcurve(fcu, cur[0], cur[1],
0);
}
}
}
@@ -231,18 +226,18 @@
/* does current have same value as previous and
next? */
if (IS_EQT(cur[1], prev[1], thresh) == 0) {
/* add new keyframe*/
- insert_vert_fcu(fcu, cur[0], cur[1], 0);
+ insert_vert_fcurve(fcu, cur[0], cur[1],
0);
}
else if (IS_EQT(cur[1], next[1], thresh) == 0) {
/* add new keyframe */
- insert_vert_fcu(fcu, cur[0], cur[1], 0);
+ insert_vert_fcurve(fcu, cur[0], cur[1],
0);
}
}
else {
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18713] branches/blender2.5/blender/source /blender: 2.5
Revision: 18713
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18713
Author: ton
Date: 2009-01-28 12:27:25 +0100 (Wed, 28 Jan 2009)
Log Message:
---
2.5
Filewindow: restored some usability issues :)
(Andrea: Hope you're OK, I needed to test stuff, and
file open was a pain!)
- F1: shows last saved/opened file now
- Enter key loads, ESC cancels
- Hilites on mousemove now show same theme colors as before
- Enabled intended roundbox draw (was added to UI api)
- Tweaked roundbox hilites to nicely surround text
- Text was drawing too close to collumn dividers
- Brought back missing glDisable(GL_BLEND), messed with draw
- On file-open, mouse position is used to show active file
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
branches/blender2.5/blender/source/blender/editors/space_file/file_intern.h
branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
branches/blender2.5/blender/source/blender/editors/space_file/space_file.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
===
--- branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
2009-01-28 09:55:36 UTC (rev 18712)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
2009-01-28 11:27:25 UTC (rev 18713)
@@ -89,38 +89,12 @@
static void do_file_buttons(bContext *C, void *arg, int event)
{
- SpaceFile *sfile= (SpaceFile*)CTX_wm_space_data(C);
switch(event) {
case B_FS_LOAD:
- {
- char name[FILE_MAX];
-
- ED_screen_full_prevspace(C);
- if(sfile-op) {
- wmOperator *op= sfile-op;
-
- /* if load .blend, all UI pointers
after exec are invalid! */
- /* but, operator can be freed still */
-
- sfile-op = NULL;
- BLI_strncpy(name, sfile-params-dir,
sizeof(name));
- strcat(name, sfile-params-file);
- RNA_string_set(op-ptr, filename,
name);
-
- op-type-exec(C, op);
-
- WM_operator_free(op);
- }
-
- }
+ file_load_exec(C, NULL);/* file_ops.c */
break;
case B_FS_CANCEL:
- if(sfile-op) {
- WM_operator_free(sfile-op);
- sfile-op = NULL;
- }
- ED_screen_full_prevspace(C);
-
+ file_cancel_exec(C, NULL); /* file_ops.c */
break;
}
}
@@ -203,15 +177,16 @@
static void draw_tile(short sx, short sy, short width, short height, int
colorid, int shade)
{
/* TODO: BIF_ThemeColor seems to need this to show the color, not sure
why? - elubie */
- glEnable(GL_BLEND);
- glColor4ub(0, 0, 0, 100);
- glDisable(GL_BLEND);
+ //glEnable(GL_BLEND);
+ //glColor4ub(0, 0, 0, 100);
+ //glDisable(GL_BLEND);
+ /* I think it was a missing glDisable() - ton */
UI_ThemeColorShade(colorid, shade);
uiSetRoundBox(15);
- glRecti(sx, sy - height, sx + width, sy);
+ // glRecti(sx, sy - height, sx + width, sy);
- // uiRoundBox(sx+TILE_BORDER_X, sy - sfile-prv_h - TILE_BORDER_Y*3 -
U.fontsize, sx + sfile-prv_w + TILE_BORDER_X*3, sy, 6);
+ uiRoundBox(sx, sy - height, sx + width, sy, 6);
}
static float shorten_string(char* string, float w)
@@ -367,10 +342,10 @@
if (params-active_file == i) {
colorid = TH_ACTIVE;
- draw_tile(sx, sy, sfile-tile_w, sfile-tile_h,
colorid,0);
+ draw_tile(sx - 1, sy, sfile-tile_w + 1, sfile-tile_h,
colorid,0);
} else if (file-flags ACTIVE) {
colorid = TH_HILITE;
- draw_tile(sx, sy, sfile-tile_w, sfile-tile_h,
colorid,0);
+ draw_tile(sx - 1, sy, sfile-tile_w + 1, sfile-tile_h,
colorid,0);
} else {
colorid = TH_BACK;
draw_tile(sx, sy, sfile-tile_w, sfile-tile_h,
colorid, -5);
@@ -424,18 +399,18 @@
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18714] branches/blender2.5/blender/source /blender: 2.5
Revision: 18714
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18714
Author: ton
Date: 2009-01-28 13:28:50 +0100 (Wed, 28 Jan 2009)
Log Message:
---
2.5
Bugfix in last commit: the read-file hotkey (enter) has to be in
the window handler queue, so it nicely exits all queues without
using free'd data.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
branches/blender2.5/blender/source/blender/editors/space_file/space_file.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
===
--- branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
2009-01-28 11:27:25 UTC (rev 18713)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_ops.c
2009-01-28 12:28:50 UTC (rev 18714)
@@ -506,7 +506,7 @@
/* api callbacks */
ot-exec= file_load_exec;
- ot-poll= ED_operator_file_active;
+ ot-poll= ED_operator_file_active; /* - important, handler is on
window level */
}
Modified:
branches/blender2.5/blender/source/blender/editors/space_file/space_file.c
===
--- branches/blender2.5/blender/source/blender/editors/space_file/space_file.c
2009-01-28 11:27:25 UTC (rev 18713)
+++ branches/blender2.5/blender/source/blender/editors/space_file/space_file.c
2009-01-28 12:28:50 UTC (rev 18714)
@@ -261,6 +261,7 @@
WM_operatortype_append(ED_FILE_OT_cancel);
}
+/* NOTE: do not add .blend file reading on this level */
void file_keymap(struct wmWindowManager *wm)
{
ListBase *keymap= WM_keymap_listbase(wm, File, SPACE_FILE, 0);
@@ -268,7 +269,6 @@
WM_keymap_add_item(keymap, ED_FILE_OT_select_all, AKEY, KM_PRESS, 0,
0);
WM_keymap_add_item(keymap, ED_FILE_OT_border_select, BKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, ED_FILE_OT_highlight, MOUSEMOVE, KM_ANY,
0, 0);
- WM_keymap_add_item(keymap, ED_FILE_OT_load, RETKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, ED_FILE_OT_cancel, ESCKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, ED_FILE_OT_loadimages, TIMER1, KM_ANY,
KM_ANY, 0);
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
===
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
2009-01-28 11:27:25 UTC (rev 18713)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
2009-01-28 12:28:50 UTC (rev 18714)
@@ -529,6 +529,8 @@
WM_event_add_notifier(C, NC_WM|ND_FILEREAD, NULL);
// refresh_interface_font();
+
+ CTX_wm_window_set(C, NULL); /* exits queues */
}
// else if(retval==1)
// XXX BIF_undo_push(Import file);
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
===
---
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
2009-01-28 11:27:25 UTC (rev 18713)
+++
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
2009-01-28 12:28:50 UTC (rev 18714)
@@ -1171,5 +1171,6 @@
WM_keymap_verify_item(keymap, WM_OT_save_as_mainfile, F2KEY,
KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, WM_OT_window_fullscreen_toggle, F11KEY,
KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, WM_OT_exit_blender, QKEY, KM_PRESS,
KM_CTRL, 0);
+ WM_keymap_add_item(keymap, ED_FILE_OT_load, RETKEY, KM_PRESS, 0, 0);
}
___
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 [18715] trunk/blender/source/blender/ blenkernel/intern/softbody.c: bug fix softbody wind
Revision: 18715
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18715
Author: bjornmose
Date: 2009-01-28 13:34:22 +0100 (Wed, 28 Jan 2009)
Log Message:
---
bug fix softbody wind
-compensating factor 1000 that comes from
pdDoEffectors() since Aug 2008
-give particles and soft body vertices the same
polarity on force fields.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/softbody.c
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2009-01-28
12:28:50 UTC (rev 18714)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2009-01-28
12:34:22 UTC (rev 18715)
@@ -1562,7 +1562,7 @@
/* note we don't use sb-mediafrict but use
sb-aeroedge for magnitude of effect*/
if(sb-aeroedge){
float vel[3],sp[3],pr[3],force[3];
- float f,windfactor = 250.0f;
+ float f,windfactor = 0.25f;
/*see if we have wind*/
if(do_effector) {
float speed[3]={0.0f,0.0f,0.0f};
@@ -2392,7 +2392,7 @@
BodyPoint *bproot;
ListBase *do_effector;
float iks, gravity;
- float fieldfactor = 1000.0f, windfactor = 250.0f;
+ float fieldfactor = -1.0f, windfactor = 0.25;
int do_deflector,do_selfcollision,do_springcollision,do_aero;
gravity = sb-grav * sb_grav_force_scale(ob);
@@ -2454,7 +2454,7 @@
BodySpring *bs;
ListBase *do_effector;
float iks, ks, kd, gravity;
- float fieldfactor = 1000.0f, windfactor = 250.0f;
+ float fieldfactor = -1.0f, windfactor = 0.25f;
float tune = sb-ballstiff;
int a, b,
do_deflector,do_selfcollision,do_springcollision,do_aero;
___
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 [18716] branches/blender2.5/blender/source /blender: 2.5
Revision: 18716
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18716
Author: ton
Date: 2009-01-28 14:16:43 +0100 (Wed, 28 Jan 2009)
Log Message:
---
2.5
Joshua asked me to check depsgraph drivers; i've added the
very minimal case, but further I'm stuck, need help.
Also made region listeners for Graph Editor work for all.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
branches/blender2.5/blender/source/blender/editors/space_ipo/space_ipo.c
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
2009-01-28 12:34:22 UTC (rev 18715)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
2009-01-28 13:16:43 UTC (rev 18716)
@@ -347,11 +347,16 @@
// XXX rotational difference
}
else if (driver-id) {
- /* normal channel-drives-channel */
- node1 = dag_get_node(dag, driver-id); // XXX we
assume that id is an object...
+ if(GS(driver-id-name)==ID_OB) {
+ /* normal channel-drives-channel */
+ node1 = dag_get_node(dag, driver-id);
- // XXX what happens for bone drivers?
- dag_add_relation(dag, node1, node,
isdata?DAG_RL_OB_DATA:DAG_RL_OB_OB, Ipo Driver);
+ // XXX how to find out rnapath is bone?
+ if( ((Object *)driver-id)-type==OB_ARMATURE )
+ dag_add_relation(dag, node1, node,
isdata?DAG_RL_DATA_DATA:DAG_RL_DATA_OB, Ipo Driver);
+ else
+ dag_add_relation(dag, node1, node,
isdata?DAG_RL_OB_DATA:DAG_RL_OB_OB, Ipo Driver);
+ }
}
#if 0 // XXX old 'normal' type
Modified:
branches/blender2.5/blender/source/blender/editors/space_ipo/space_ipo.c
===
--- branches/blender2.5/blender/source/blender/editors/space_ipo/space_ipo.c
2009-01-28 12:34:22 UTC (rev 18715)
+++ branches/blender2.5/blender/source/blender/editors/space_ipo/space_ipo.c
2009-01-28 13:16:43 UTC (rev 18716)
@@ -279,7 +279,7 @@
UI_view2d_view_restore(C);
}
-static void graph_main_area_listener(ARegion *ar, wmNotifier *wmn)
+static void graph_region_listener(ARegion *ar, wmNotifier *wmn)
{
/* context changes */
switch(wmn-category) {
@@ -377,7 +377,7 @@
art-regionid = RGN_TYPE_WINDOW;
art-init= graph_main_area_init;
art-draw= graph_main_area_draw;
- art-listener= graph_main_area_listener;
+ art-listener= graph_region_listener;
art-keymapflag=
ED_KEYMAP_VIEW2D/*|ED_KEYMAP_MARKERS*/|ED_KEYMAP_ANIMATION|ED_KEYMAP_FRAMES;
BLI_addhead(st-regiontypes, art);
@@ -387,7 +387,7 @@
art-regionid = RGN_TYPE_HEADER;
art-minsizey= HEADERY;
art-keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D|ED_KEYMAP_FRAMES;
-
+ art-listener= graph_region_listener;
art-init= graph_header_area_init;
art-draw= graph_header_area_draw;
@@ -398,7 +398,7 @@
art-regionid = RGN_TYPE_CHANNELS;
art-minsizex= 200;
art-keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D|ED_KEYMAP_FRAMES;
-
+ art-listener= graph_region_listener;
art-init= graph_channel_area_init;
art-draw= graph_channel_area_draw;
___
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 [18717] branches/blender2.5/blender/source /blender: 2.5
Revision: 18717 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18717 Author: ton Date: 2009-01-28 16:39:39 +0100 (Wed, 28 Jan 2009) Log Message: --- 2.5 Made 'select-tweak-grab' work in 3d window, fcurve and nodes. For nodes it works with both left/right, the others follow user preset for select. Tweak is a WM event, which also follows user preset for tablet-style tweaks (release = apply). You enable tweak events with an operator WM_OT_tweak_gesture. Keymap entries can assign to left/middle/right button or to action/select button tweaks. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_ops.c branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_select.c branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c branches/blender2.5/blender/source/blender/editors/space_node/node_select.c branches/blender2.5/blender/source/blender/editors/space_node/node_state.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_generics.c branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c Modified: branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c === --- branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c 2009-01-28 13:16:43 UTC (rev 18716) +++ branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c 2009-01-28 15:39:39 UTC (rev 18717) @@ -867,7 +867,7 @@ WM_keymap_add_item(keymap, MARKER_OT_move, GKEY, KM_PRESS, 0, 0); - /* generates event, in end to make select work */ + /* generates event, needs to be after select to work */ WM_keymap_verify_item(keymap, WM_OT_tweak_gesture, RIGHTMOUSE, KM_PRESS, 0, 0); } Modified: branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_ops.c === --- branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_ops.c 2009-01-28 13:16:43 UTC (rev 18716) +++ branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_ops.c 2009-01-28 15:39:39 UTC (rev 18717) @@ -186,7 +186,9 @@ //WM_keymap_add_item(keymap, GRAPHEDIT_OT_set_previewrange, PKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); //WM_keymap_add_item(keymap, GRAPHEDIT_OT_view_all, HOMEKEY, KM_PRESS, 0, 0); - + /* generates event, needs to be after select to work */ + WM_keymap_add_item(keymap, WM_OT_tweak_gesture, SELECTMOUSE, KM_PRESS, 0, 0); + /* transform system */ transform_keymap_for_space(wm, keymap, SPACE_IPO); } Modified: branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_select.c === --- branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_select.c 2009-01-28 13:16:43 UTC (rev 18716) +++ branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_select.c 2009-01-28 15:39:39 UTC (rev 18717) @@ -870,7 +870,8 @@ /* set notifier tha things have changed */ ANIM_animdata_send_notifiers(C, ac, ANIM_CHANGED_BOTH); - return OPERATOR_FINISHED; + /* for tweak grab to work */ + return OPERATOR_PASS_THROUGH; } void GRAPHEDIT_OT_keyframes_clickselect (wmOperatorType *ot) Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c === --- branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c 2009-01-28 13:16:43 UTC (rev 18716) +++ branches/blender2.5/blender/source/blender/editors/space_node/node_ops.c 2009-01-28 15:39:39 UTC (rev 18717) @@ -73,5 +73,9 @@ WM_keymap_add_item(keymap, NODE_OT_border_select, BKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, NODE_OT_delete_selection, XKEY, KM_PRESS, 0, 0); + /* generates event, needs to be after select to work */ + WM_keymap_add_item(keymap, WM_OT_tweak_gesture, ACTIONMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, WM_OT_tweak_gesture, SELECTMOUSE, KM_PRESS, 0, 0); + transform_keymap_for_space(wm, keymap, SPACE_NODE); } Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_select.c === --- branches/blender2.5/blender/source/blender/editors/space_node/node_select.c 2009-01-28 13:16:43 UTC (rev 18716) +++
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18718] branches/blender2.5/blender/ projectfiles_vc9/blender: 2.5 MSVC9 projectfiles
Revision: 18718 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18718 Author: elubie Date: 2009-01-28 19:02:15 +0100 (Wed, 28 Jan 2009) Log Message: --- 2.5 MSVC9 projectfiles updates: * windowmanager/wm_draw.c * editors/space_ipo: ipo_draw.c, ipo_edit.c and ipo_ops.c Modified Paths: -- branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj branches/blender2.5/blender/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj Modified: branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj === --- branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-01-28 15:39:39 UTC (rev 18717) +++ branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-01-28 18:02:15 UTC (rev 18718) @@ -206,10 +206,18 @@ /File File + RelativePath=..\..\..\source\blender\editors\include\ED_editparticle.h + + /File + File RelativePath=..\..\..\source\blender\editors\include\ED_fileselect.h /File File + RelativePath=..\..\..\source\blender\editors\include\ED_fluidsim.h + + /File + File RelativePath=..\..\..\source\blender\editors\include\ED_gpencil.h /File @@ -238,6 +246,10 @@ /File File + RelativePath=..\..\..\source\blender\editors\include\ED_node.h + + /File + File RelativePath=..\..\..\source\blender\editors\include\ED_object.h /File @@ -559,6 +571,10 @@ /File File + RelativePath=..\..\..\source\blender\editors\space_ipo\ipo_edit.c + + /File + File RelativePath=..\..\..\source\blender\editors\space_ipo\ipo_header.c /File @@ -567,6 +583,14 @@ /File File + RelativePath=..\..\..\source\blender\editors\space_ipo\ipo_ops.c + + /File + File + RelativePath=..\..\..\source\blender\editors\space_ipo\ipo_select.c + + /File + File RelativePath=..\..\..\source\blender\editors\space_ipo\space_ipo.c /File @@ -706,6 +730,10 @@ RelativePath=..\..\..\source\blender\editors\space_file\space_file.c /File + File + RelativePath=..\..\..\source\blender\editors\space_file\writeimage.c + + /File /Filter Filter Name=space_info @@ -1147,9 +1175,25 @@ Name=curve File + RelativePath=..\..\..\source\blender\editors\curve\curve_intern.h + + /File + File + RelativePath=..\..\..\source\blender\editors\curve\curve_ops.c + + /File + File RelativePath=..\..\..\source\blender\editors\curve\editcurve.c /File + File + RelativePath=..\..\..\source\blender\editors\curve\editfont.c + + /File + File + RelativePath=..\..\..\source\blender\editors\curve\lorem.c + + /File /Filter Filter Name=preview @@ -1163,6 +1207,22 @@
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18719] branches/blender2.5/blender/source /blender: 2.5
Revision: 18719
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18719
Author: ton
Date: 2009-01-28 19:26:47 +0100 (Wed, 28 Jan 2009)
Log Message:
---
2.5
Some drawing tweaks for animsys:
- added notifier ND_KEYS type, to send proper notes around.
now insert-key redraws fcurve/action view
- made slider-draggers disappear when view is total or bigger.
Also experimented with making sliders go away entirely, but
this conflicts too much with current code for channel lists.
Ali: I think you have to make call that calculates the 'tot'
for channels, and run this in region listener, including the
totRect update for view2d.
The 'minsize' for channels also fails when there's a slider,
it always doesn't fit then :)
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/editors/interface/view2d.c
branches/blender2.5/blender/source/blender/editors/space_action/space_action.c
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c
branches/blender2.5/blender/source/blender/editors/space_ipo/space_ipo.c
branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c
branches/blender2.5/blender/source/blender/makesdna/DNA_view2d_types.h
branches/blender2.5/blender/source/blender/windowmanager/WM_types.h
Modified:
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
===
--- branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
2009-01-28 18:02:15 UTC (rev 18718)
+++ branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
2009-01-28 18:26:47 UTC (rev 18719)
@@ -2117,9 +2117,9 @@
ED_undo_push(C, Insert Keyframe);
if (mode == 3) // material color requires different notifiers
- WM_event_add_notifier(C, NC_MATERIAL|ND_SHADING_DRAW, NULL);
+ WM_event_add_notifier(C, NC_MATERIAL|ND_KEYS, NULL);
else
- WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+ WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, NULL);
return OPERATOR_FINISHED;
}
@@ -2184,7 +2184,7 @@
ED_undo_push(C, Delete Keyframe);
// XXX what if it was a material keyframe?
- WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
+ WM_event_add_notifier(C, NC_OBJECT|ND_KEYS, NULL);
return OPERATOR_FINISHED;
}
Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d.c
===
--- branches/blender2.5/blender/source/blender/editors/interface/view2d.c
2009-01-28 18:02:15 UTC (rev 18718)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d.c
2009-01-28 18:26:47 UTC (rev 18719)
@@ -57,6 +57,91 @@
#include interface_intern.h
/* *** */
+
+/* helper to allow scrollbars to dynamically hide */
+static int view2d_scroll_mapped(int scroll)
+{
+ if(scroll V2D_SCROLL_HORIZONTAL_HIDE)
+ scroll = ~(V2D_SCROLL_HORIZONTAL);
+ if(scroll V2D_SCROLL_VERTICAL_HIDE)
+ scroll = ~(V2D_SCROLL_VERTICAL);
+ return scroll;
+}
+
+/* called each time cur changes, to dynamically update masks */
+static void view2_masks(View2D *v2d)
+{
+ int scroll;
+
+ /* mask - view frame */
+ v2d-mask.xmin= v2d-mask.ymin= 0;
+ v2d-mask.xmax= v2d-winx - 1; /* -1 yes! masks are pixels */
+ v2d-mask.ymax= v2d-winy - 1;
+
+#if 0
+ v2d-scroll = ~(V2D_SCROLL_HORIZONTAL_HIDE|V2D_SCROLL_VERTICAL_HIDE);
+ /* check size if: */
+ if (v2d-scroll V2D_SCROLL_HORIZONTAL)
+ if(!(v2d-scroll V2D_SCROLL_SCALE_HORIZONTAL))
+ if (v2d-tot.xmax-v2d-tot.xmin =
v2d-cur.xmax-v2d-cur.xmin)
+ v2d-scroll |= V2D_SCROLL_HORIZONTAL_HIDE;
+ if (v2d-scroll V2D_SCROLL_VERTICAL)
+ if(!(v2d-scroll V2D_SCROLL_SCALE_VERTICAL))
+ if (v2d-tot.ymax-v2d-tot.ymin =
v2d-cur.ymax-v2d-cur.ymin)
+ v2d-scroll |= V2D_SCROLL_VERTICAL_HIDE;
+#endif
+ scroll= view2d_scroll_mapped(v2d-scroll);
+
+ /* scrollers shrink mask area, but should be based off regionsize
+ * - they can only be on one to two edges of the region
they define
+ * - if they overlap, they must not occupy the corners
(which are reserved for other widgets)
+ */
+ if (scroll) {
+ /* vertical scroller */
+ if (scroll V2D_SCROLL_LEFT) {
+ /* on left-hand edge of region */
+ v2d-vert= v2d-mask;
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18720] branches/blender2.5/blender/source /blender: 2.5
Revision: 18720 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18720 Author: ton Date: 2009-01-28 19:36:55 +0100 (Wed, 28 Jan 2009) Log Message: --- 2.5 Moved file load and ESC file-window to screen_ops.c, there it belongs! Modified Paths: -- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c branches/blender2.5/blender/source/blender/editors/space_file/space_file.c branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c === --- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c 2009-01-28 18:26:47 UTC (rev 18719) +++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c 2009-01-28 18:36:55 UTC (rev 18720) @@ -1760,6 +1760,10 @@ WM_keymap_verify_item(keymap, SCREEN_OT_repeat_last, F4KEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, SCREEN_OT_region_flip, F5KEY, KM_PRESS, 0, 0); + /* files */ + WM_keymap_add_item(keymap, ED_FILE_OT_load, RETKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, ED_FILE_OT_cancel, ESCKEY, KM_PRESS, 0, 0); + /* undo */ WM_keymap_add_item(keymap, ED_OT_undo, ZKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, ED_OT_undo, ZKEY, KM_PRESS, KM_OSKEY, 0); Modified: branches/blender2.5/blender/source/blender/editors/space_file/space_file.c === --- branches/blender2.5/blender/source/blender/editors/space_file/space_file.c 2009-01-28 18:26:47 UTC (rev 18719) +++ branches/blender2.5/blender/source/blender/editors/space_file/space_file.c 2009-01-28 18:36:55 UTC (rev 18720) @@ -269,7 +269,6 @@ WM_keymap_add_item(keymap, ED_FILE_OT_select_all, AKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, ED_FILE_OT_border_select, BKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, ED_FILE_OT_highlight, MOUSEMOVE, KM_ANY, 0, 0); - WM_keymap_add_item(keymap, ED_FILE_OT_cancel, ESCKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, ED_FILE_OT_loadimages, TIMER1, KM_ANY, KM_ANY, 0); Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c === --- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c 2009-01-28 18:26:47 UTC (rev 18719) +++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c 2009-01-28 18:36:55 UTC (rev 18720) @@ -1171,6 +1171,6 @@ WM_keymap_verify_item(keymap, WM_OT_save_as_mainfile, F2KEY, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, WM_OT_window_fullscreen_toggle, F11KEY, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, WM_OT_exit_blender, QKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, ED_FILE_OT_load, RETKEY, KM_PRESS, 0, 0); + } ___ 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 [18721] branches/blender2.5/blender/source /blender: 2.5:
Revision: 18721
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18721
Author: blendix
Date: 2009-01-28 20:42:49 +0100 (Wed, 28 Jan 2009)
Log Message:
---
2.5:
* Fix using enter key for selecting item in a submenu.
* Fix some non working buttons in nodes.
* Fix memory leak when using glsl.
* Change triple buffer proxy test a bit, hopefully this succeeds
on more cards now.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/interface/interface.c
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_draw.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.c
===
--- branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-01-28 18:36:55 UTC (rev 18720)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-01-28 19:42:49 UTC (rev 18721)
@@ -433,8 +433,8 @@
if(but-rnaprop != oldbut-rnaprop)
if(but-rnaindex != oldbut-rnaindex) return 0;
if(but-func != oldbut-func) return 0;
- if(but-func_arg1 != oldbut-func_arg1) return 0;
- if(but-func_arg2 != oldbut-func_arg2) return 0;
+ if(oldbut-func_arg1 != oldbut but-func_arg1 != oldbut-func_arg1)
return 0;
+ if(oldbut-func_arg2 != oldbut but-func_arg2 != oldbut-func_arg2)
return 0;
return 1;
}
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
===
---
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2009-01-28 18:36:55 UTC (rev 18720)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2009-01-28 19:42:49 UTC (rev 18721)
@@ -157,7 +157,52 @@
static int ui_handler_region_menu(bContext *C, wmEvent *event, void *userdata);
static int ui_handler_popup(bContext *C, wmEvent *event, void *userdata);
static void ui_handler_remove_popup(bContext *C, void *userdata);
+static void ui_handle_button_activate(bContext *C, ARegion *ar, uiBut *but,
uiButtonActivateType type);
+/* menu navigation helpers ** */
+
+static uiBut *ui_but_prev(uiBut *but)
+{
+ while(but-prev) {
+ but= but-prev;
+ if(but-type!=LABEL but-type!=SEPR but-type!=ROUNDBOX)
return but;
+ }
+ return NULL;
+}
+
+static uiBut *ui_but_next(uiBut *but)
+{
+ while(but-next) {
+ but= but-next;
+ if(but-type!=LABEL but-type!=SEPR but-type!=ROUNDBOX)
return but;
+ }
+ return NULL;
+}
+
+static uiBut *ui_but_first(uiBlock *block)
+{
+ uiBut *but;
+
+ but= block-buttons.first;
+ while(but) {
+ if(but-type!=LABEL but-type!=SEPR but-type!=ROUNDBOX)
return but;
+ but= but-next;
+ }
+ return NULL;
+}
+
+static uiBut *ui_but_last(uiBlock *block)
+{
+ uiBut *but;
+
+ but= block-buttons.last;
+ while(but) {
+ if(but-type!=LABEL but-type!=SEPR but-type!=ROUNDBOX)
return but;
+ but= but-prev;
+ }
+ return NULL;
+}
+
/* ** button apply/revert /
static ListBase UIAfterFuncs = {NULL, NULL};
@@ -2892,8 +2937,23 @@
button_activate_state(C, but, BUTTON_STATE_HIGHLIGHT);
- if(type == BUTTON_ACTIVATE_OPEN)
+ if(type == BUTTON_ACTIVATE_OPEN) {
button_activate_state(C, but, BUTTON_STATE_MENU_OPEN);
+
+ /* activate first button in submenu */
+ if(data-menu data-menu-region) {
+ ARegion *subar= data-menu-region;
+ uiBlock *subblock= subar-uiblocks.first;
+ uiBut *subbut;
+
+ if(subblock) {
+ subbut= ui_but_first(subblock);
+
+ if(subbut)
+ ui_handle_button_activate(C, subar,
subbut, BUTTON_ACTIVATE);
+ }
+ }
+ }
else if(type == BUTTON_ACTIVATE_TEXT_EDITING)
button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING);
else if(type == BUTTON_ACTIVATE_APPLY)
@@ -3155,50 +3215,6 @@
}
}
-/* menu navigation helpers ** */
-
-static uiBut *ui_but_prev(uiBut *but)
-{
- while(but-prev) {
- but= but-prev;
- if(but-type!=LABEL but-type!=SEPR but-type!=ROUNDBOX)
return but;
- }
- return NULL;
-}
-
-static uiBut *ui_but_next(uiBut *but)
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18722] branches/blender2.5/blender/source /blender: 2.5:
Revision: 18722 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18722 Author: blendix Date: 2009-01-28 22:43:43 +0100 (Wed, 28 Jan 2009) Log Message: --- 2.5: * UV Editor Transform, translate, rotate, scale, live unwrap, snap, gesture, etc work. * Also for selection operators, used OPERATOR_FINISHED|OPERATOR_PASS_THROUGH instead of just OPERATOR_PASS_THROUGH to make gestures work, seems more correct to me. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/include/ED_uvedit.h branches/blender2.5/blender/source/blender/editors/space_image/image_header.c branches/blender2.5/blender/source/blender/editors/space_image/image_intern.h branches/blender2.5/blender/source/blender/editors/space_image/space_image.c branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_select.c branches/blender2.5/blender/source/blender/editors/space_node/node_select.c branches/blender2.5/blender/source/blender/editors/transform/transform.c branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c branches/blender2.5/blender/source/blender/editors/transform/transform_snap.c branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_intern.h branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c Added Paths: --- branches/blender2.5/blender/source/blender/editors/include/ED_image.h Added: branches/blender2.5/blender/source/blender/editors/include/ED_image.h === --- branches/blender2.5/blender/source/blender/editors/include/ED_image.h (rev 0) +++ branches/blender2.5/blender/source/blender/editors/include/ED_image.h 2009-01-28 21:43:43 UTC (rev 18722) @@ -0,0 +1,39 @@ +/** + * $Id: + * + * * 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) 2008 Blender Foundation. + * All rights reserved. + * + * Contributor(s): Blender Foundation + * + * * END GPL LICENSE BLOCK * + */ + +#ifndef ED_IMAGE_H +#define ED_IMAGE_H + +struct SpaceImage; + +/* space_image.c, exported for transform */ +struct Image *ED_space_image(struct SpaceImage *sima); +void ED_space_image_size(struct SpaceImage *sima, int *width, int *height); +void ED_space_image_uv_aspect(struct SpaceImage *sima, float *aspx, float *aspy); + +#endif /* ED_IMAGE_H */ + Modified: branches/blender2.5/blender/source/blender/editors/include/ED_uvedit.h === --- branches/blender2.5/blender/source/blender/editors/include/ED_uvedit.h 2009-01-28 19:42:49 UTC (rev 18721) +++ branches/blender2.5/blender/source/blender/editors/include/ED_uvedit.h 2009-01-28 21:43:43 UTC (rev 18722) @@ -30,6 +30,8 @@ struct Scene; struct Object; +struct MTFace; +struct EditFace; struct Image; struct wmWindowManager; @@ -41,5 +43,20 @@ void ED_uvedit_set_tile(struct Scene *scene, struct Object *obedit, struct Image *ima, int curtile, int dotile); int ED_uvedit_minmax(struct Scene *scene, struct Image *ima, struct Object *obedit, float *min, float *max); +int ED_uvedit_test_silent(struct Object *obedit); +int ED_uvedit_test(struct Object *obedit); + +int uvedit_face_visible(struct Scene *scene, struct Image *ima, struct EditFace *efa, struct MTFace *tf); +int uvedit_face_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf); +int uvedit_edge_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); +int uvedit_uv_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); + +int ED_uvedit_nearest_uv(struct Scene *scene, struct Object *obedit, struct Image *ima, float co[2], float uv[2]); + +/* uvedit_unwrap.c */ +void ED_uvedit_live_unwrap_begin(struct Scene *scene, struct
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18723] branches/blender2.5/blender/source /blender: * Was missing checks for scene- ed which crashed blender when using the sequencer for the first
Revision: 18723
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18723
Author: campbellbarton
Date: 2009-01-28 23:36:34 +0100 (Wed, 28 Jan 2009)
Log Message:
---
* Was missing checks for scene-ed which crashed blender when using the
sequencer for the first time.
* Added WM_OT_tweak_gesture operator for select, drag
* Sequencer select operator now returns OPERATOR_FINISHED|OPERATOR_PASS_THROUGH
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_sequence.h
branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c
branches/blender2.5/blender/source/blender/blenlib/intern/bpath.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_draw.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_ops.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_select.c
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-28 21:43:43 UTC (rev 18722)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_sequence.h
2009-01-28 22:36:34 UTC (rev 18723)
@@ -140,6 +140,7 @@
void seq_free_sequence(struct Editing *ed, struct Sequence *seq);
void seq_free_strip(struct Strip *strip);
void seq_free_editing(struct Editing *ed);
+struct Editing *seq_give_editing(struct Scene *scene, int alloc);
char *give_seqname(struct Sequence *seq);
struct ImBuf *give_ibuf_seq(struct Scene *scene, int rectx, int recty, int
cfra, int chanshown);
struct ImBuf *give_ibuf_seq_threaded(struct Scene *scene, int rectx, int
recty, int cfra, int chanshown);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
2009-01-28 21:43:43 UTC (rev 18722)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
2009-01-28 22:36:34 UTC (rev 18723)
@@ -251,7 +251,7 @@
}
while(scene) {
- ed= scene-ed;
+ ed= seq_give_editing(scene, 0);
if(ed) {
seq= ed-seqbasep-first;
while(seq) {
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c
2009-01-28 21:43:43 UTC (rev 18722)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/sequence.c
2009-01-28 22:36:34 UTC (rev 18723)
@@ -184,6 +184,17 @@
MEM_freeN(seq);
}
+Editing *seq_give_editing(Scene *scene, int alloc)
+{
+ if (scene-ed == NULL alloc) {
+ Editing *ed;
+
+ ed= scene-ed= MEM_callocN( sizeof(Editing), addseq);
+ ed-seqbasep= ed-seqbase;
+ }
+ return scene-ed;
+}
+
void seq_free_editing(Editing *ed)
{
MetaStack *ms;
@@ -594,10 +605,10 @@
{
/* all strips together per kind, and in order of y location (machine)
*/
ListBase seqbase, effbase;
- Editing *ed;
+ Editing *ed= seq_give_editing(scene, FALSE);
Sequence *seq, *seqt;
- ed= scene-ed;
+
if(ed==NULL) return;
seqbase.first= seqbase.last= 0;
@@ -1036,14 +1047,11 @@
int evaluate_seq_frame(Scene *scene, int cfra)
{
- Editing *ed;
- Sequence *seq_arr[MAXSEQ+1];
+ Editing *ed= seq_give_editing(scene, FALSE);
+ Sequence *seq_arr[MAXSEQ+1];
- ed= scene-ed;
- if(ed==NULL) return 0;
-
- return evaluate_seq_frame_gen(seq_arr, ed-seqbasep, cfra);
-
+ if(ed==NULL) return 0;
+ return evaluate_seq_frame_gen(seq_arr, ed-seqbasep, cfra);
}
static int video_seq_is_rendered(Sequence * seq)
@@ -2403,12 +2411,12 @@
static ImBuf *give_ibuf_seq_impl(Scene *scene, int rectx, int recty, int cfra,
int chanshown)
{
- Editing *ed;
+ Editing *ed= seq_give_editing(scene, FALSE);
int count;
ListBase *seqbasep;
TStripElem *se;
- ed= scene-ed;
+
if(ed==NULL) return NULL;
count =
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18724] branches/blender2.5/blender/source /blender/editors: Animation Editors: Tweaking/Refresh Issues
Revision: 18724
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18724
Author: aligorith
Date: 2009-01-28 23:51:42 +0100 (Wed, 28 Jan 2009)
Log Message:
---
Animation Editors: Tweaking/Refresh Issues
* Added 'select-tweak' functionality to DopeSheet
* Added proper notifiers for Graph Editor updates
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/animation/anim_deps.c
branches/blender2.5/blender/source/blender/editors/space_action/action_ops.c
branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_deps.c
===
--- branches/blender2.5/blender/source/blender/editors/animation/anim_deps.c
2009-01-28 22:36:34 UTC (rev 18723)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_deps.c
2009-01-28 22:51:42 UTC (rev 18724)
@@ -145,6 +145,8 @@
/* types of notifiers to send, depends on the editor context */
switch (ac-datatype) {
case ANIMCONT_DOPESHEET: /* dopesheet */
+ case ANIMCONT_FCURVES: /* fcurve editor */
+ case ANIMCONT_DRIVERS: /* drivers editor */ // XXX probably
this will need separate handling, since these are part of dependency system
{
/* what action was taken */
switch (data_changed) {
@@ -153,8 +155,9 @@
// XXX what about other cases? maybe we
need general ND_KEYFRAMES or ND_ANIMATION?
WM_event_add_notifier(C,
NC_OBJECT|ND_TRANSFORM, NULL);
break;
- //case ANIM_CHANGED_KEYFRAMES_SELECT: // XXX
what to do here?
- // break;
+ case ANIM_CHANGED_KEYFRAMES_SELECT: // XXX
what to do here?
+ WM_event_add_notifier(C, NC_SCENE,
NULL);
+ break;
case ANIM_CHANGED_CHANNELS:
// XXX err... check available datatypes
in dopesheet first?
// FIXME: this currently doesn't work
(to update own view)
Modified:
branches/blender2.5/blender/source/blender/editors/space_action/action_ops.c
===
---
branches/blender2.5/blender/source/blender/editors/space_action/action_ops.c
2009-01-28 22:36:34 UTC (rev 18723)
+++
branches/blender2.5/blender/source/blender/editors/space_action/action_ops.c
2009-01-28 22:51:42 UTC (rev 18724)
@@ -138,6 +138,9 @@
/* auto-set range */
WM_keymap_add_item(keymap, ACT_OT_set_previewrange, PKEY, KM_PRESS,
KM_CTRL|KM_ALT, 0);
WM_keymap_add_item(keymap, ACT_OT_view_all, HOMEKEY, KM_PRESS, 0, 0);
+
+ /* generates event, needs to be after select to work */
+ WM_keymap_add_item(keymap, WM_OT_tweak_gesture, SELECTMOUSE,
KM_PRESS, 0, 0);
/* transform system */
transform_keymap_for_space(wm, keymap, SPACE_ACTION);
Modified:
branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
===
---
branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
2009-01-28 22:36:34 UTC (rev 18723)
+++
branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
2009-01-28 22:51:42 UTC (rev 18724)
@@ -1068,7 +1068,8 @@
/* set notifier tha things have changed */
ANIM_animdata_send_notifiers(C, ac, ANIM_CHANGED_BOTH);
- return OPERATOR_FINISHED;
+ /* for tweak grab to work */
+ return OPERATOR_FINISHED|OPERATOR_PASS_THROUGH;
}
void ACT_OT_keyframes_clickselect (wmOperatorType *ot)
___
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 [18725] branches/blender2.5/blender/source /blender: 2.5:
Revision: 18725
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18725
Author: blendix
Date: 2009-01-29 00:29:27 +0100 (Thu, 29 Jan 2009)
Log Message:
---
2.5:
* Automatic shortcut keys in menus now compare operator properties as well.
Implemented IDP_EqualsProperties for this.
* I imagine all these compares may be a bit slow, for this case it's not
so bad though because it only happens for one menu when it is opened.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_idprop.h
branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
branches/blender2.5/blender/source/blender/editors/interface/interface.c
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_keymap.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_idprop.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_idprop.h
2009-01-28 22:51:42 UTC (rev 18724)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_idprop.h
2009-01-28 23:29:27 UTC (rev 18725)
@@ -142,6 +142,8 @@
struct IDProperty *IDP_GetProperties(struct ID *id, int create_if_needed);
struct IDProperty *IDP_CopyProperty(struct IDProperty *prop);
+int IDP_EqualsProperties(struct IDProperty *prop1, struct IDProperty *prop2);
+
/*
Allocate a new ID.
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
2009-01-28 22:51:42 UTC (rev 18724)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/idprop.c
2009-01-28 23:29:27 UTC (rev 18725)
@@ -527,6 +527,60 @@
}
}
+int IDP_EqualsProperties(IDProperty *prop1, IDProperty *prop2)
+{
+ if(prop1 == NULL prop2 == NULL)
+ return 1;
+ else if(prop1 == NULL || prop2 == NULL)
+ return 0;
+ else if(prop1-type != prop2-type)
+ return 0;
+
+ if(prop1-type == IDP_INT)
+ return (IDP_Int(prop1) == IDP_Int(prop2));
+ else if(prop1-type == IDP_FLOAT)
+ return (IDP_Float(prop1) == IDP_Float(prop2));
+ else if(prop1-type == IDP_DOUBLE)
+ return (IDP_Double(prop1) == IDP_Double(prop2));
+ else if(prop1-type == IDP_STRING)
+ return BSTR_EQ(IDP_String(prop1), IDP_String(prop2));
+ else if(prop1-type == IDP_ARRAY) {
+ if(prop1-len == prop2-len prop1-subtype == prop2-subtype)
+ return memcmp(IDP_Array(prop1), IDP_Array(prop2),
idp_size_table[prop1-subtype]*prop1-len);
+ else
+ return 0;
+ }
+ else if(prop1-type == IDP_GROUP) {
+ IDProperty *link1, *link2;
+
+ if(BLI_countlist(prop1-data.group) !=
BLI_countlist(prop2-data.group))
+ return 0;
+
+ for(link1=prop1-data.group.first; link1; link1=link1-next) {
+ link2= IDP_GetPropertyFromGroup(prop2, link1-name);
+
+ if(!IDP_EqualsProperties(link1, link2))
+ return 0;
+ }
+
+ return 1;
+ }
+ else if(prop1-type == IDP_IDPARRAY) {
+ IDProperty *array1= IDP_IDPArray(prop1);
+ IDProperty *array2= IDP_IDPArray(prop2);
+ int i;
+
+ if(prop1-len != prop2-len)
+ return 0;
+
+ for(i=0; iprop1-len; i++)
+ if(!IDP_EqualsProperties(array1[i], array2[i]))
+ return 0;
+ }
+
+ return 1;
+}
+
IDProperty *IDP_New(int type, IDPropertyTemplate val, const char *name)
{
IDProperty *prop=NULL;
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.c
===
--- branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-01-28 22:51:42 UTC (rev 18724)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-01-28 23:29:27 UTC (rev 18725)
@@ -482,13 +482,15 @@
static void ui_menu_block_set_keymaps(const bContext *C, uiBlock *block)
{
uiBut *but;
+ IDProperty *prop;
char buf[512], *butstr;
+ int bounds= 0;;
- /* XXX bounds? */
for(but=block-buttons.first; but; but=but-next) {
- /* only hotkey for menus without properties */
- if(but-opname but-opptr==NULL) {
- if(WM_key_event_operator_string(C, but-opname,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18726] branches/blender2.5/blender/source /blender/editors/interface: 2.5: fix for issue in last commit, menu bounds were no always
Revision: 18726
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18726
Author: blendix
Date: 2009-01-29 00:56:21 +0100 (Thu, 29 Jan 2009)
Log Message:
---
2.5: fix for issue in last commit, menu bounds were no always
computed correct.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/interface/interface.c
branches/blender2.5/blender/source/blender/editors/interface/interface_intern.h
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.c
===
--- branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-01-28 23:29:27 UTC (rev 18725)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-01-28 23:56:21 UTC (rev 18726)
@@ -207,11 +207,17 @@
/* *** block calc * */
-/* only for pulldowns */
void uiTextBoundsBlock(uiBlock *block, int addval)
{
+ block-textbounds= addval;
+ block-dotextbounds= 1;
+}
+
+/* only for pulldowns */
+static void ui_text_bounds_block(uiBlock *block)
+{
uiBut *bt;
- int i = 0, j, x1addval= 0, nextcol;
+ int i = 0, j, x1addval= 0, nextcol, addval= block-textbounds;
bt= block-buttons.first;
while(bt) {
@@ -505,10 +511,6 @@
}
}
}
-
- // XXX not nice ..
- if(bounds)
- uiTextBoundsBlock(block, 50);
}
void uiEndBlock(const bContext *C, uiBlock *block)
@@ -533,9 +535,12 @@
/* handle pending stuff */
if(block-flag UI_BLOCK_LOOP) ui_menu_block_set_keymaps(C, block);
+ if(block-dotextbounds) ui_text_bounds_block(block); /* after keymaps!
*/
if(block-autofill) ui_autofill(block);
if(block-minx==0.0 block-maxx==0.0) uiBoundsBlock(block, 0);
if(block-flag UI_BUT_ALIGN) uiBlockEndAlign(block);
+
+ block-endblock= 1;
}
/* ** BLOCK DRAWING FUNCTION * */
@@ -544,6 +549,9 @@
{
uiBut *but;
+ if(!block-endblock)
+ uiEndBlock(C, block);
+
/* we set this only once */
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_intern.h
===
---
branches/blender2.5/blender/source/blender/editors/interface/interface_intern.h
2009-01-28 23:29:27 UTC (rev 18725)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_intern.h
2009-01-28 23:56:21 UTC (rev 18726)
@@ -214,7 +214,9 @@
int lock;
char *lockstr;
- float xofs, yofs; // offset to parent button
+ float xofs, yofs; // offset to parent
button
+ int textbounds, dotextbounds; // for doing delayed
+ int endblock; // uiEndBlock done?
rctf safety;// pulldowns, to detect
outside, can differ per case how it is created
ListBase saferct; // uiSafetyRct list
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
===
---
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
2009-01-28 23:29:27 UTC (rev 18725)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
2009-01-28 23:56:21 UTC (rev 18726)
@@ -651,6 +651,9 @@
block= block_func(C, handle, arg);
block-handle= handle;
+ if(!block-endblock)
+ uiEndBlock(C, block);
+
/* if this is being created from a button */
if(but) {
if(ELEM(but-type, BLOCK, PULLDOWN))
___
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 [18727] branches/blender2.5/blender/source /blender: Animato: Conversion code + drawing tweaks
Revision: 18727
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18727
Author: aligorith
Date: 2009-01-29 04:43:04 +0100 (Thu, 29 Jan 2009)
Log Message:
---
Animato: Conversion code + drawing tweaks
* Recoded the conversion code so that all data gets converted. Previously, some
IPO's and Actions (notably the ones used for Action Constraints) were not
ported across.
* Made F-Curve drawing use more saturated colours to make them more visible.
I'm not sure whether this works well in practice.
* Restored some horizontal bounding-box checks to optimise drawing.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
branches/blender2.5/blender/source/blender/editors/animation/anim_ipo_utils.c
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
2009-01-28 23:56:21 UTC (rev 18726)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
2009-01-29 03:43:04 UTC (rev 18727)
@@ -113,8 +113,12 @@
}
/* *** */
-/* ADRCODE to RNA-Path Conversion Code */
+/* ADRCODE to RNA-Path Conversion Code - Special (Bitflags) */
+
+/* *** */
+/* ADRCODE to RNA-Path Conversion Code - Standard */
+
/* Object types */
static char *ob_adrcodes_to_paths (int adrcode, int *array_index)
{
@@ -793,7 +797,7 @@
* actname: name of Action-Channel (if applicable) that IPO-Curve's
IPO-block belonged to
* constname: name of Constraint-Channel (if applicable) that IPO-Curve's
IPO-block belonged to
*/
-static FCurve *icu_to_fcu (IpoCurve *icu, char *actname, char *constname)
+static void icu_to_fcurves (ListBase *list, IpoCurve *icu, char *actname, char
*constname)
{
FCurve *fcu;
int i= 0;
@@ -807,6 +811,51 @@
icu-driver= NULL;
}
+ /* copy flags */
+ if (icu-flag IPO_VISIBLE) fcu-flag |= FCURVE_VISIBLE;
+ if (icu-flag IPO_SELECT) fcu-flag |= FCURVE_SELECTED;
+ if (icu-flag IPO_ACTIVE) fcu-flag |= FCURVE_ACTIVE;
+ if (icu-flag IPO_MUTE) fcu-flag |= FCURVE_MUTED;
+ if (icu-flag IPO_PROTECT) fcu-flag |= FCURVE_PROTECTED;
+ if (icu-flag IPO_AUTO_HORIZ) fcu-flag |= FCURVE_AUTO_HANDLES;
+
+ /* set extrapolation */
+ switch (icu-extrap) {
+ case IPO_HORIZ: /* constant extrapolation */
+ case IPO_DIR: /* linear extrapolation */
+ {
+ /* just copy, as the new defines match the old ones...
*/
+ fcu-extend= icu-extrap;
+ }
+ break;
+
+ case IPO_CYCL: /* cyclic extrapolation */
+ case IPO_CYCLX: /* cyclic extrapolation + offset */
+ {
+ /* Add a new FModifier (Cyclic) instead of setting
extend value
+* as that's the new equivilant of that option.
+*/
+ FModifier *fcm= fcurve_add_modifier(fcu,
FMODIFIER_TYPE_CYCLES);
+ FMod_Cycles *data= (FMod_Cycles *)fcm-data;
+
+ /* if 'offset' one is in use, set appropriate settings
*/
+ if (icu-extrap == IPO_CYCLX)
+ data-before_mode= data-after_mode=
FCM_EXTRAPOLATE_CYCLIC_OFFSET;
+ else
+ data-before_mode= data-after_mode=
FCM_EXTRAPOLATE_CYCLIC;
+ }
+ break;
+ }
+
+ /* */
+
+ /* get rna-path
+* - we will need to set the 'disabled' flag if no path is able to
be made (for now)
+*/
+ fcu-rna_path= get_rna_access(icu-blocktype, icu-adrcode, actname,
constname, fcu-array_index);
+ if (fcu-rna_path == NULL)
+ fcu-flag |= FCURVE_DISABLED;
+
/* convert keyframes
* - beztriples and bpoints are mutually exclusive, so we won't
have both at the same time
* - beztriples are more likely to be encountered as they are
keyframes (the other type wasn't used yet)
@@ -850,76 +899,26 @@
//FPoint *fpt;
}
- /* get rna-path
-* - we will need to set the 'disabled' flag if no path is able to
be made (for now)
-*/
- fcu-rna_path= get_rna_access(icu-blocktype, icu-adrcode, actname,
constname, fcu-array_index);
- if (fcu-rna_path == NULL)
- fcu-flag |= FCURVE_DISABLED;
-
- /* copy flags */
- if (icu-flag
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18728] branches/blender2.5/blender/source /blender: * Brought back special normal recalc for sculpt ( only recalculates modified faces/verts)
Revision: 18728
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18728
Author: nicholasbishop
Date: 2009-01-29 04:50:46 +0100 (Thu, 29 Jan 2009)
Log Message:
---
* Brought back special normal recalc for sculpt (only recalculates modified
faces/verts)
* Means that full object recalc isn't done, so multires works more as expected
now
* Moved mesh element cache back to sculpt session (from sculpt cache), really
makes more sense there
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_sculpt.h
branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_sculpt.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_sculpt.h
2009-01-29 03:43:04 UTC (rev 18727)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_sculpt.h
2009-01-29 03:50:46 UTC (rev 18728)
@@ -30,16 +30,22 @@
#ifndef BKE_SCULPT_H
#define BKE_SCULPT_H
-struct NumInput;
-struct RadialControl;
-struct Scene;
+struct MFace;
+struct MultireModifierData;
+struct MVert;
struct Sculpt;
-struct SculptSession;
struct StrokeCache;
typedef struct SculptSession {
struct ProjVert *projverts;
+ /* Mesh data (not copied) can come either directly from a Mesh, or from
a MultiresDM */
+ struct MultiresModifierData *multires; /* Special handling for multires
meshes */
+ struct MVert *mvert;
+ struct MFace *mface;
+ int totvert, totface;
+ float *face_normals;
+
/* Mesh connectivity */
struct ListBase *fmap;
struct IndexNode *fmap_mem;
@@ -55,8 +61,6 @@
void *cursor; /* wm handle */
- struct RadialControl *radialcontrol;
-
struct SculptStroke *stroke;
struct StrokeCache *cache;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
2009-01-29 03:43:04 UTC (rev 18727)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
2009-01-29 03:50:46 UTC (rev 18728)
@@ -1018,15 +1018,16 @@
/* Modulate curve with texture */
if(texcache) {
- for(i=0; iside; ++i)
+ for(i=0; iside; ++i) {
for(j=0; jside; ++j) {
const int col= texcache[i*side+j];
im-rect_float[i*side+j]*=
(((char*)col)[0]+((char*)col)[1]+((char*)col)[2])/3.0f/255.0f;
}
+ }
+
+ MEM_freeN(texcache);
}
- MEM_freeN(texcache);
-
return im;
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
2009-01-29 03:43:04 UTC (rev 18727)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
2009-01-29 03:50:46 UTC (rev 18728)
@@ -658,9 +658,6 @@
if(ss-projverts)
MEM_freeN(ss-projverts);
- if(ss-radialcontrol)
- MEM_freeN(ss-radialcontrol);
-
if(ss-fmap)
MEM_freeN(ss-fmap);
Modified: branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
===
--- branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-29 03:43:04 UTC (rev 18727)
+++ branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-29 03:50:46 UTC (rev 18728)
@@ -145,13 +145,6 @@
ViewContext vc;
bglMats *mats;
- /* Mesh data (not copied) can come either directly from a Mesh, or from
a MultiresDM */
- int multires; /* Special handling for multires meshes */
- MVert *mvert;
- MFace *mface;
- int totvert, totface;
- float *face_normals;
-
float *layer_disps; /* Displacements for each vertex */
float (*mesh_store)[3]; /* Copy of the mesh vertices' locations */
short (*orig_norms)[3]; /* Copy of the mesh vertices' normals */
@@ -331,7 +324,7 @@
}
else {
for(; node; node = node-next)
- add_norm_if(out_dir, out, out_flip,
cache-mvert[node-Index].no);
+ add_norm_if(out_dir, out, out_flip,
sd-session-mvert[node-Index].no);
}
if (out[0]==0.0 out[1]==0.0 out[2]==0.0) {
@@ -359,7 +352,7 @@
sculpt_axislock(sd,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18729] branches/blender2.5/blender/source : Moving Language code from interface/text.c to blenfont library.
Revision: 18729 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18729 Author: bdiego Date: 2009-01-29 06:19:27 +0100 (Thu, 29 Jan 2009) Log Message: --- Moving Language code from interface/text.c to blenfont library. I go to start commit the new code here and then replace one by one bmfont and ftfont, this do nothing right now, but it's more easy keep the files here to work from the studio and my home. I only update the Makefile and SConscript (but JesterKing a double check never is bad), so please check the msvc and cmake files. The new library is libblenfont.a Modified Paths: -- branches/blender2.5/blender/source/Makefile branches/blender2.5/blender/source/blender/Makefile branches/blender2.5/blender/source/blender/SConscript branches/blender2.5/blender/source/blender/editors/include/UI_text.h branches/blender2.5/blender/source/blender/editors/interface/Makefile branches/blender2.5/blender/source/blender/editors/interface/text.c branches/blender2.5/blender/source/blender/windowmanager/SConscript branches/blender2.5/blender/source/blender/windowmanager/intern/Makefile branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c Added Paths: --- branches/blender2.5/blender/source/blender/blenfont/ branches/blender2.5/blender/source/blender/blenfont/BLF_api.h branches/blender2.5/blender/source/blender/blenfont/Makefile branches/blender2.5/blender/source/blender/blenfont/SConscript branches/blender2.5/blender/source/blender/blenfont/intern/ branches/blender2.5/blender/source/blender/blenfont/intern/Makefile branches/blender2.5/blender/source/blender/blenfont/intern/blf_internal_types.h branches/blender2.5/blender/source/blender/blenfont/intern/blf_lang.c Modified: branches/blender2.5/blender/source/Makefile === --- branches/blender2.5/blender/source/Makefile 2009-01-29 03:50:46 UTC (rev 18728) +++ branches/blender2.5/blender/source/Makefile 2009-01-29 05:19:27 UTC (rev 18729) @@ -107,6 +107,7 @@ COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a COMLIB += $(NAN_GLEW)/lib/libglew.a COMLIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a +COMLIB += $(OCGDIR)/blender/blenfont/$(DEBUG_DIR)libblenfont.a ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a Modified: branches/blender2.5/blender/source/blender/Makefile === --- branches/blender2.5/blender/source/blender/Makefile 2009-01-29 03:50:46 UTC (rev 18728) +++ branches/blender2.5/blender/source/blender/Makefile 2009-01-29 05:19:27 UTC (rev 18729) @@ -34,6 +34,7 @@ DIRS += avi imbuf render radiosity blenlib blenkernel blenpluginapi DIRS += makesdna makesrna yafray DIRS += python nodes gpu +DIRS += blenfont ifeq ($(WITH_FREETYPE2), true) DIRS += ftfont Modified: branches/blender2.5/blender/source/blender/SConscript === --- branches/blender2.5/blender/source/blender/SConscript 2009-01-29 03:50:46 UTC (rev 18728) +++ branches/blender2.5/blender/source/blender/SConscript 2009-01-29 05:19:27 UTC (rev 18729) @@ -17,7 +17,8 @@ 'readblenfile/SConscript', 'render/SConscript', 'nodes/SConscript', -'windowmanager/SConscript']) +'windowmanager/SConscript', + 'blenfont/SConscript']) Added: branches/blender2.5/blender/source/blender/blenfont/BLF_api.h === --- branches/blender2.5/blender/source/blender/blenfont/BLF_api.h (rev 0) +++ branches/blender2.5/blender/source/blender/blenfont/BLF_api.h 2009-01-29 05:19:27 UTC (rev 18729) @@ -0,0 +1,52 @@ +/** + * $Id: + * + * * 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) 2009 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + *
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18730] branches/blender2.5/blender/source : Added CMake files needed for new blenfont module.
Revision: 18730
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18730
Author: nicholasbishop
Date: 2009-01-29 07:35:04 +0100 (Thu, 29 Jan 2009)
Log Message:
---
Added CMake files needed for new blenfont module.
Note to bdiego: this module seems to depend on ftfont, which is only compiled
with the INTERNATIONAL build setting, however it seems blenfont should work
regardless of that setting.
Modified Paths:
--
branches/blender2.5/blender/source/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
branches/blender2.5/blender/source/creator/CMakeLists.txt
Added Paths:
---
branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
Modified: branches/blender2.5/blender/source/blender/CMakeLists.txt
===
--- branches/blender2.5/blender/source/blender/CMakeLists.txt 2009-01-29
05:19:27 UTC (rev 18729)
+++ branches/blender2.5/blender/source/blender/CMakeLists.txt 2009-01-29
06:35:04 UTC (rev 18730)
@@ -24,7 +24,7 @@
#
# * END GPL LICENSE BLOCK *
-SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader
blenpluginapi imbuf imbuf/intern/cineon gpu makesdna makesrna radiosity
readblenfile render)
+SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader
blenpluginapi imbuf imbuf/intern/cineon gpu makesdna makesrna radiosity
readblenfile render blenfont)
IF(WITH_INTERNATIONAL)
SUBDIRS(ftfont)
Added: branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
===
--- branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
(rev 0)
+++ branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
2009-01-29 06:35:04 UTC (rev 18730)
@@ -0,0 +1,34 @@
+# $Id $
+# * 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) 2008, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# * END GPL LICENSE BLOCK *
+
+FILE(GLOB SRC intern/*.c)
+
+#SET(INC . intern ../../../intern/guardedalloc ../blenlib ../blenkernel
../makedna
+
+SET(INC
+ ../../../intern/guardedalloc ../blenlib ../makesdna
+ ../blenkernel ../ftfont
+)
+
+BLENDERLIB(bf_blenfont ${SRC} ${INC})
\ No newline at end of file
Modified: branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
===
--- branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
2009-01-29 05:19:27 UTC (rev 18729)
+++ branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
2009-01-29 06:35:04 UTC (rev 18730)
@@ -38,6 +38,7 @@
../../../intern/ghost ../../../intern/opennl/extern
../../../extern/glew/include
../nodes
../gpu
+ ../blenfont
${SDL_INC}
)
Modified:
branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
===
--- branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
2009-01-29 05:19:27 UTC (rev 18729)
+++ branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
2009-01-29 06:35:04 UTC (rev 18730)
@@ -38,6 +38,7 @@
../../../intern/ghost ../../../intern/opennl/extern
../../../extern/glew/include
../nodes
../gpu
+ ../blenfont
${SDL_INC}
)
Modified: branches/blender2.5/blender/source/creator/CMakeLists.txt
===
--- branches/blender2.5/blender/source/creator/CMakeLists.txt 2009-01-29
05:19:27 UTC (rev 18729)
+++ branches/blender2.5/blender/source/creator/CMakeLists.txt 2009-01-29
06:35:04 UTC (rev 18730)
@@ -274,6 +274,7 @@
bf_videotex
bf_rna
bf_dna
+bf_blenfont
)
FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
