[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17887] branches/blender2.5/blender/source /blender/editors: UI: added the following functions to create buttons for RNA properties and for
Revision: 17887 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17887 Author: blendix Date: 2008-12-16 08:55:43 +0100 (Tue, 16 Dec 2008) Log Message: --- UI: added the following functions to create buttons for RNA properties and for operators. RNA property buttons will automatically fill in the label, min/max, etc if they are not specified. Operator menu buttons will look up the key combination in the handlers and add it automatically. uiDefButR, uiDefIconButR, uiDefIconTextButR uiDefButO, uiDefIconButO, uiDefIconTextButO uiDefButO takes a context pointer to do the key lookup, don't really like this.. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/include/UI_interface.h branches/blender2.5/blender/source/blender/editors/interface/interface.c branches/blender2.5/blender/source/blender/editors/interface/interface.h branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c branches/blender2.5/blender/source/blender/editors/space_time/time_header.c Modified: branches/blender2.5/blender/source/blender/editors/include/UI_interface.h === --- branches/blender2.5/blender/source/blender/editors/include/UI_interface.h 2008-12-16 07:53:59 UTC (rev 17886) +++ branches/blender2.5/blender/source/blender/editors/include/UI_interface.h 2008-12-16 07:55:43 UTC (rev 17887) @@ -258,6 +258,8 @@ uiBut *uiDefButBitS(uiBlock *block, int type, int bit, int retval, char *str, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip); uiBut *uiDefButC(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip); uiBut *uiDefButBitC(uiBlock *block, int type, int bit, int retval, char *str, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip); +uiBut *uiDefButR(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, struct PointerRNA *ptr, const char *propname, int index, float min, float max, float a1, float a2, char *tip); +uiBut *uiDefButO(struct bContext *C, uiBlock *block, int type, char *opname, int opcontext, char *str, short x1, short y1, short x2, short y2, char *tip); uiBut *uiDefIconBut(uiBlock *block, int type, int retval, int icon, @@ -274,9 +276,16 @@ uiBut *uiDefIconButBitS(uiBlock *block, int type, int bit, int retval, int icon, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip); uiBut *uiDefIconButC(uiBlock *block, int type, int retval, int icon, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip); uiBut *uiDefIconButBitC(uiBlock *block, int type, int bit, int retval, int icon, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip); +uiBut *uiDefIconButR(uiBlock *block, int type, int retval, int icon, short x1, short y1, short x2, short y2, struct PointerRNA *ptr, const char *propname, int index, float min, float max, float a1, float a2, char *tip); +uiBut *uiDefIconButO(struct bContext *C, uiBlock *block, int type, char *opname, int opcontext, int icon, short x1, short y1, short x2, short y2, char *tip); -uiBut *uiDefIconTextBut(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, char *tip); - +uiBut *uiDefIconTextBut(uiBlock *block, + int type, int retval, int icon, char *str, + short x1, short y1, + short x2, short y2, + void *poin, + float min, float max, + float a1, float a2, char *tip); uiBut *uiDefIconTextButF(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip); uiBut *uiDefIconTextButBitF(uiBlock *block, int type, int bit, int retval, int icon, char *str, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip); uiBut *uiDefIconTextButI(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip); @@ -285,6 +294,8 @@ uiBut *uiDefIconTextButBitS(uiBlock *block, int type, int bit, int retval, int icon,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17886] branches/blender2.5/blender/source /blender/blenloader/intern/readfile.c:
Revision: 17886
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17886
Author: blendix
Date: 2008-12-16 08:53:59 +0100 (Tue, 16 Dec 2008)
Log Message:
---
2.5: Fix crash in sequencer reading code.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
Modified:
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2008-12-16 07:44:21 UTC (rev 17885)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2008-12-16 07:53:59 UTC (rev 17886)
@@ -8021,10 +8021,9 @@
if ((main->versionfile < 245) || (main->versionfile == 245 &&
main->subversionfile < 14)) {
Scene *sce;
Sequence *seq;
- Editing *ed;
for(sce=main->scene.first; sce; sce=sce->id.next) {
- SEQ_BEGIN(ed, seq) {
+ SEQ_BEGIN(sce->ed, seq) {
if (seq->blend_mode == 0)
seq->blend_opacity = 100.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 [17885] branches/blender2.5/blender/source /blender:
Revision: 17885 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17885 Author: blendix Date: 2008-12-16 08:44:21 +0100 (Tue, 16 Dec 2008) Log Message: --- WM: changed WM_operator_call to take an argument, which specifies in which context to run the operator: WM_OP_DEFAULT, WM_OP_REGION_WIN, WM_OP_AREA or WM_OP_SCREEN. This also replaces WM_operator_call_rwin since it is more general. This is useful for buttons and popup menus to run operators, and also used by a new function to lookup the keymap item for that operator in the right context. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c branches/blender2.5/blender/source/blender/editors/space_time/time_header.c 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/intern/wm_keymap.c Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c === --- branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c 2008-12-16 07:32:12 UTC (rev 17884) +++ branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c 2008-12-16 07:44:21 UTC (rev 17885) @@ -1654,7 +1654,7 @@ const char *opname= arg; if(retval > 0) - WM_operator_call(C, opname); + WM_operator_call(C, opname, WM_OP_DEFAULT); } void okee_operator(bContext *C, char *opname, char *str, ...) 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 2008-12-16 07:32:12 UTC (rev 17884) +++ branches/blender2.5/blender/source/blender/editors/space_time/time_header.c 2008-12-16 07:44:21 UTC (rev 17885) @@ -282,19 +282,19 @@ WM_event_add_notifier(C, WM_NOTE_WINDOW_REDRAW, 0, NULL); break; case 3: /* Add Marker */ - WM_operator_call_rwin(C, "ED_MARKER_OT_add"); + WM_operator_call(C, "ED_MARKER_OT_add", WM_OP_REGION_WIN); break; case 4: /* Remove Marker */ - WM_operator_call_rwin(C, "ED_MARKER_OT_delete"); + WM_operator_call(C, "ED_MARKER_OT_delete", WM_OP_REGION_WIN); break; case 5: /* Rename Marker */ //rename_marker(); break; case 6: /* Grab Marker */ - WM_operator_call_rwin(C, "ED_MARKER_OT_move"); + WM_operator_call(C, "ED_MARKER_OT_move", WM_OP_REGION_WIN); break; case 7: /* duplicate marker */ - WM_operator_call_rwin(C, "ED_MARKER_OT_duplicate"); + WM_operator_call(C, "ED_MARKER_OT_duplicate", WM_OP_REGION_WIN); break; } } Modified: branches/blender2.5/blender/source/blender/windowmanager/WM_api.h === --- branches/blender2.5/blender/source/blender/windowmanager/WM_api.h 2008-12-16 07:32:12 UTC (rev 17884) +++ branches/blender2.5/blender/source/blender/windowmanager/WM_api.h 2008-12-16 07:44:21 UTC (rev 17885) @@ -72,6 +72,7 @@ int spaceid, int regionid); char *WM_key_event_string(short type); +char *WM_key_event_operator_string(bContext *C, char *opname, int opcontext, char *str, int len); /* handlers */ @@ -111,8 +112,7 @@ wmOperatorType *WM_operatortype_find(const char *idname); void WM_operatortype_append (void (*opfunc)(wmOperatorType*)); -int WM_operator_call (struct bContext *C, const char *opstring); -int WM_operator_call_rwin (struct bContext *C, const char *opstring); +int WM_operator_call (struct bContext *C, const char *opstring, int context); /* default operator callbacks for border/lasso */ intWM_border_select_invoke (struct bContext *C, wmOperator *op, struct wmEvent *event); Modified: branches/blender2.5/blender/source/blender/windowmanager/WM_types.h === --- branches/blender2.5/blender/source/blender/windowmanager/WM_types.h 2008-12-16 07:32:12 UTC (rev 17884) +++ branches/blender2.5/blender/source/blender/windowmanager/WM_types.h 20
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17884] branches/blender2.5/blender/source /blender:
Revision: 17884
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17884
Author: blendix
Date: 2008-12-16 08:32:12 +0100 (Tue, 16 Dec 2008)
Log Message:
---
UI: bring back function to convert keyboard event to string, and
make the key event button work again.
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/WM_api.h
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_keymap.c
branches/blender2.5/blender/source/blender/windowmanager/wm_event_types.h
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.c
===
--- branches/blender2.5/blender/source/blender/editors/interface/interface.c
2008-12-15 20:53:45 UTC (rev 17883)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.c
2008-12-16 07:32:12 UTC (rev 17884)
@@ -44,6 +44,7 @@
#include "BLI_dynstr.h"
#include "BKE_global.h"
+#include "BKE_library.h"
#include "BKE_screen.h"
#include "BKE_texture.h"
#include "BKE_utildefines.h"
@@ -1587,8 +1588,7 @@
if (but->flag & UI_SELECT) {
strcat(but->drawstr, "Press a key");
} else {
- /* XXX 2.50 function not supported */
- /* strcat(but->drawstr, key_event_to_string((short)
ui_get_but_val(but))); */
+ strcat(but->drawstr, WM_key_event_string((short)
ui_get_but_val(but)));
}
break;
@@ -2073,8 +2073,8 @@
/* autocomplete callback for ID buttons */
static void autocomplete_id(bContext *C, char *str, void *arg_v)
{
- /* int blocktype= (intptr_t)arg_v; */
- ListBase *listb= NULL /* XXX 2.50 needs context, wich_libbase(G.main,
blocktype) */;
+ int blocktype= (intptr_t)arg_v;
+ ListBase *listb= wich_libbase(G.main, blocktype); /* XXX */
if(listb==NULL) return;
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
===
---
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2008-12-15 20:53:45 UTC (rev 17883)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2008-12-16 07:32:12 UTC (rev 17884)
@@ -1449,17 +1449,14 @@
if(event->type == MOUSEMOVE)
return WM_UI_HANDLER_CONTINUE;
- /* XXX 2.50 missing function */
-#if 0
if(event->val) {
- if(!key_event_to_string(event)[0])
+ if(WM_key_event_string(event->type)[0])
+ ui_set_but_val(but, event->type);
+ else
data->cancel= 1;
- else
- ui_set_but_val(but, event->type);
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
-#endif
}
return WM_UI_HANDLER_CONTINUE;
@@ -2660,8 +2657,12 @@
/* check if the mouse is in the region, and in case of a view2d also
check
* if it is inside the view2d itself, not over scrollbars for example */
- if(!BLI_in_rcti(&ar->winrct, x, y))
+ if(!BLI_in_rcti(&ar->winrct, x, y)) {
+ for(block=ar->uiblocks.first; block; block=block->next)
+ block->auto_open= 0;
+
return NULL;
+ }
if(ar->v2d.mask.xmin!=ar->v2d.mask.xmax) {
mx= x;
Modified: branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
===
--- branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
2008-12-15 20:53:45 UTC (rev 17883)
+++ branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
2008-12-16 07:32:12 UTC (rev 17884)
@@ -61,7 +61,7 @@
void WM_cursor_wait (struct wmWindow *win, int val);
void WM_timecursor (struct wmWindow *win, int nr);
- /* keymap and handlers */
+ /* keymap */
wmKeymapItem *WM_keymap_set_item (ListBase *lb, char *idname, short
type,
short val, int
modifier, short keymodifier);
wmKeymapItem *WM_keymap_verify_item(ListBase *lb, char *idname, short type,
@@ -71,7 +71,10 @@
ListBase *WM_keymap_listbase (wmWindowManager *wm, const char
*nameid,
int spaceid,
int regionid);
+char *WM_key_event_string(short type);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17883] trunk/blender/source/gameengine/ GamePlayer/ghost: B
Revision: 17883
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17883
Author: hos
Date: 2008-12-15 21:53:45 +0100 (Mon, 15 Dec 2008)
Log Message:
---
B
Linking of blenderplayer was failing with unresolved symbols
(initVideoTexture) when building without FFMPEG. Needs
testing with SCons and Makefiles.
Modified Paths:
--
trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/Makefile
trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
===
--- trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
2008-12-15 19:41:46 UTC (rev 17882)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
2008-12-15 20:53:45 UTC (rev 17883)
@@ -70,5 +70,9 @@
${PYTHON_INC}
)
+IF(WITH_FFMPEG)
+ ADD_DEFINITIONS(-DWITH_FFMPEG)
+ENDIF(WITH_FFMPEG)
+
BLENDERLIB_NOLIST(gp_ghost "${SRC}" "${INC}")
#env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs,
defines = [], libtype='player',priority=0, compileflags=cflags)
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
2008-12-15 19:41:46 UTC (rev 17882)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
2008-12-15 20:53:45 UTC (rev 17883)
@@ -686,8 +686,9 @@
initGameKeys();
initPythonConstraintBinding();
initMathutils();
+#ifdef WITH_FFMPEG
initVideoTexture();
-
+#endif
// Set the GameLogic.globalDict from marshal'd data, so we can
// load new blend files and keep data in GameLogic.globalDict
loadGamePythonConfig(m_pyGlobalDictString,
m_pyGlobalDictString_Length);
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/Makefile
===
--- trunk/blender/source/gameengine/GamePlayer/ghost/Makefile 2008-12-15
19:41:46 UTC (rev 17882)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/Makefile 2008-12-15
20:53:45 UTC (rev 17883)
@@ -82,3 +82,6 @@
CPPFLAGS += -I$(NAN_GHOST)/include
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
+ifeq ($(WITH_FFMPEG), true)
+ CPPFLAGS += -DWITH_FFMPEG
+endif
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
===
--- trunk/blender/source/gameengine/GamePlayer/ghost/SConscript 2008-12-15
19:41:46 UTC (rev 17882)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/SConscript 2008-12-15
20:53:45 UTC (rev 17883)
@@ -49,5 +49,7 @@
if env['OURPLATFORM']=='win32-vc':
cflags = ['/GR']
+if env['WITH_BF_FFMPEG']:
+defs += ' WITH_FFMPEG'
env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs,
defines = [], libtype='player',priority=0, compileflags=cflags)
___
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 [17882] branches/blender2.5/blender/source /blender/editors/screen/area.c: 2.5
Revision: 17882
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17882
Author: ton
Date: 2008-12-15 20:41:46 +0100 (Mon, 15 Dec 2008)
Log Message:
---
2.5
Undo last commit to save screen redraws on are switching,
seems some initialize is missing.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/screen/area.c
Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===
--- branches/blender2.5/blender/source/blender/editors/screen/area.c
2008-12-15 19:29:53 UTC (rev 17881)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c
2008-12-15 19:41:46 UTC (rev 17882)
@@ -589,7 +589,7 @@
static void spacefunc(struct bContext *C, void *arg1, void *arg2)
{
newspace(C, C->area, C->area->butspacetype);
- WM_event_add_notifier(C, WM_NOTE_AREA_REDRAW, 0, NULL);
+ WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
}
/* returns offset for next button in header */
___
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 [17881] branches/blender2.5/blender/source /blender: Depricated Image Select window, so it doesnt crash :)
Revision: 17881
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17881
Author: ton
Date: 2008-12-15 20:29:53 +0100 (Mon, 15 Dec 2008)
Log Message:
---
Depricated Image Select window, so it doesnt crash :)
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/screen/area.c
Modified:
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2008-12-15 19:19:39 UTC (rev 17880)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2008-12-15 19:29:53 UTC (rev 17881)
@@ -5211,6 +5211,12 @@
area_add_window_regions(sa, sa->spacedata.first,
&sa->regionbase);
+ /* space imageselect is depricated */
+ for(sl= sa->spacedata.first; sl; sl= sl->next) {
+ if(sl->spacetype==SPACE_IMASEL)
+ sl->spacetype= SPACE_INFO; /* spacedata
then matches */
+ }
+
/* pushed back spaces also need regions! */
if(sa->spacedata.first) {
sl= sa->spacedata.first;
Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===
--- branches/blender2.5/blender/source/blender/editors/screen/area.c
2008-12-15 19:19:39 UTC (rev 17880)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c
2008-12-15 19:29:53 UTC (rev 17881)
@@ -578,7 +578,6 @@
"|Node Editor %x16"
"|%l" //254
- "|Image Browser %x10" //273
"|File Browser %x5" //290
"|%l" //293
___
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 [17880] branches/blender2.5/blender/source /blender:
Revision: 17880
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17880
Author: blendix
Date: 2008-12-15 20:19:39 +0100 (Mon, 15 Dec 2008)
Log Message:
---
UI: getting popup menus to work again, just the internal interface
and event handling code still, how it integrates with operators and
handlers is not worked out yet. For testing, Ctrl+Q quit now shows
a confirmation popup using the following call:
okee_operator(C, "WM_OT_exit_blender", "Quit Blender");
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
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/intern/wm_operators.c
branches/blender2.5/blender/source/blender/windowmanager/wm_event_system.h
Modified:
branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
===
--- branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
2008-12-15 18:43:18 UTC (rev 17879)
+++ branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
2008-12-15 19:19:39 UTC (rev 17880)
@@ -185,21 +185,32 @@
/* Popup Menu's */
typedef struct uiMenuBlockHandle {
+ /* internal */
struct ARegion *region;
+ int towardsx, towardsy;
+ double towardstime;
+ int dotowards;
+
+ int popup;
+ void (*popup_func)(struct bContext *C, void *arg, int event);
+ void *popup_arg;
+
+ /* return values */
int butretval;
int menuretval;
-
float retvalue;
float retvec[3];
} uiMenuBlockHandle;
typedef uiBlock* (*uiBlockFuncFP)(struct bContext *C, struct uiMenuBlockHandle
*handle, void *arg1);
+typedef void (*uiPupmenuFunc)(struct bContext *C, void *arg, int event);
extern void pupmenu_set_active(int val);
-extern uiMenuBlockHandle *pupmenu_col(struct bContext *C, char *instr, int mx,
int my, int maxrow);
-extern uiMenuBlockHandle *pupmenu(struct bContext *C, char *instr, int mx, int
my);
-extern void pupmenu_free(struct bContext *C, uiMenuBlockHandle *handle);
+extern void pupmenu_col(struct bContext *C, char *instr, int mx, int my, int
maxrow, uiPupmenuFunc func, void *arg);
+extern void pupmenu(struct bContext *C, char *instr, int mx, int my,
uiPupmenuFunc func, void *arg);
+void okee_operator(struct bContext *C, char *opname, char *str, ...);
+
/* Block */
uiBlock *uiBeginBlock(const struct bContext *C, struct ARegion *region, char
*name, short dt, short font);
@@ -354,6 +365,7 @@
/* Handlers for regions with UI blocks */
void UI_add_region_handlers(struct ListBase *handlers);
+void UI_add_popup_handlers(struct ListBase *handlers, uiMenuBlockHandle *menu);
/* Module initialization and exit */
@@ -361,7 +373,5 @@
void UI_init_userdef(void);
void UI_exit(void);
-void uiTestRegion(const struct bContext *C); /* XXX 2.50 temporary test */
-
#endif /* UI_INTERFACE_H */
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
===
---
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2008-12-15 18:43:18 UTC (rev 17879)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2008-12-15 19:19:39 UTC (rev 17880)
@@ -82,14 +82,6 @@
BUTTON_STATE_EXIT
} uiHandleButtonState;
-typedef struct uiHandleMenuData {
- uiMenuBlockHandle *handle;
-
- int towardsx, towardsy;
- double towardstime;
- int dotowards;
-} uiHandleMenuData;
-
typedef struct uiHandleButtonData {
wmWindow *window;
ARegion *region;
@@ -126,7 +118,7 @@
CBData *dragcbd;
/* menu open */
- uiHandleMenuData *menu;
+ uiMenuBlockHandle *menu;
int menuretval;
/* post activate */
@@ -151,7 +143,9 @@
} uiAfterFunc;
static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState
state);
-static int ui_handler_window(bContext *C, wmEvent *event);
+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);
/* ** button apply/revert /
@@ -1393,8 +1387,9 @@
}
if(func) {
- data->menu= MEM_callocN(sizeof(uiHandleMenuData),
"uiHandleMenuData");
- data->
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17879] branches/blender2.5/blender/source /blender: 2.5
Revision: 17879
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17879
Author: ton
Date: 2008-12-15 19:43:18 +0100 (Mon, 15 Dec 2008)
Log Message:
---
2.5
Small improvements;
- switch spacedata now doesn't cause full screen refresh and draw
- cursor switching is not part of SCREEN_CHANGED notifier, this
makes area dragging ugly.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/include/ED_screen.h
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_screen.h
===
--- branches/blender2.5/blender/source/blender/editors/include/ED_screen.h
2008-12-15 18:09:55 UTC (rev 17878)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_screen.h
2008-12-15 18:43:18 UTC (rev 17879)
@@ -36,6 +36,7 @@
struct wmWindowManager;
struct wmWindow;
struct wmNotifier;
+struct wmEvent;
struct SpaceType;
struct AreagionType;
struct uiBlock;
@@ -65,7 +66,7 @@
void ED_screen_refresh(struct wmWindowManager *wm, struct wmWindow *win);
void ED_screen_do_listen(struct wmWindow *win, struct wmNotifier *note);
bScreen *ED_screen_duplicate(struct wmWindow *win, struct bScreen *sc);
-void ED_screen_set_subwinactive(struct wmWindow *win);
+void ED_screen_set_subwinactive(struct wmWindow *win, struct wmEvent *event);
void ED_screen_exit(struct bContext *C, struct wmWindow *window, struct
bScreen *screen);
void ED_operatortypes_screen(void);
Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===
--- branches/blender2.5/blender/source/blender/editors/screen/area.c
2008-12-15 18:09:55 UTC (rev 17878)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c
2008-12-15 18:43:18 UTC (rev 17879)
@@ -538,9 +538,13 @@
slold->regionbase= sa->regionbase;
sa->regionbase= sl->regionbase;
sl->regionbase.first= sl->regionbase.last= NULL;
+
+ ED_area_initialize(C->wm, C->window, sa);
}
}
+ /* tell WM to refresh, cursor types etc */
+ WM_event_add_mousemove(C);
}
}
@@ -586,7 +590,7 @@
static void spacefunc(struct bContext *C, void *arg1, void *arg2)
{
newspace(C, C->area, C->area->butspacetype);
- WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
+ WM_event_add_notifier(C, WM_NOTE_AREA_REDRAW, 0, NULL);
}
/* returns offset for next button in header */
Modified:
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
===
--- branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
2008-12-15 18:09:55 UTC (rev 17878)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
2008-12-15 18:43:18 UTC (rev 17879)
@@ -994,9 +994,6 @@
if(G.f & G_DEBUG) printf("set screen\n");
win->screen->do_refresh= 0;
-
- /* cursor types too */
- ED_screen_set_subwinactive(win);
}
/* file read, set all screens, ... */
@@ -1077,15 +1074,15 @@
/* called in wm_event_system.c. sets state var in screen */
-void ED_screen_set_subwinactive(wmWindow *win)
+void ED_screen_set_subwinactive(wmWindow *win, wmEvent *event)
{
if(win->screen) {
- wmEvent *event= win->eventstate;
+ bScreen *scr= win->screen;
ScrArea *sa;
ARegion *ar;
- int oldswin= win->screen->subwinactive;
-
- for(sa= win->screen->areabase.first; sa; sa= sa->next) {
+ int oldswin= scr->subwinactive;
+
+ for(sa= scr->areabase.first; sa; sa= sa->next) {
if(event->x > sa->totrct.xmin && event->x <
sa->totrct.xmax)
if(event->y > sa->totrct.ymin && event->y <
sa->totrct.ymax)
if(NULL==is_in_area_actionzone(sa,
event->x, event->y))
@@ -1094,20 +1091,20 @@
if(sa) {
for(ar= sa->regionbase.first; ar; ar= ar->next) {
if(BLI_in_rcti(&ar->winrct, event->x, event->y))
- win->screen->subwinactive= ar->swinid;
+ scr->subwinactive= ar->swinid;
}
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17878] branches/blender2.5/blender/source /blender: 2.5
Revision: 17878
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17878
Author: ton
Date: 2008-12-15 19:09:55 +0100 (Mon, 15 Dec 2008)
Log Message:
---
2.5
Added notifiers for timeline syncing. Works for Timeline window
only now.
Note that I've removed the malloc-free in a Notifier... notifier
system is still under probabtion :)
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/include/UI_view2d.h
branches/blender2.5/blender/source/blender/editors/interface/view2d.c
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/space_time/space_time.c
branches/blender2.5/blender/source/blender/editors/space_time/time_header.c
branches/blender2.5/blender/source/blender/windowmanager/WM_types.h
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: branches/blender2.5/blender/source/blender/editors/include/UI_view2d.h
===
--- branches/blender2.5/blender/source/blender/editors/include/UI_view2d.h
2008-12-15 17:47:57 UTC (rev 17877)
+++ branches/blender2.5/blender/source/blender/editors/include/UI_view2d.h
2008-12-15 18:09:55 UTC (rev 17878)
@@ -95,6 +95,12 @@
/* half the size (in pixels) of scroller 'handles' */
#define V2D_SCROLLER_HANDLE_SIZE 5
+/* -- Define for UI_view2d_sync - */
+
+/* means copy it from the other v2d */
+#define V2D_LOCK_COPY 1
+
+
/* -- */
/* Macros: */
@@ -153,6 +159,7 @@
struct View2D *UI_view2d_fromcontext(const struct bContext *C);
struct View2D *UI_view2d_fromcontext_rwin(const struct bContext *C);
void UI_view2d_getscale(struct View2D *v2d, float *x, float *y);
+void UI_view2d_sync(struct View2D *v2d, struct View2D *v2dfrom, int flag);
/* operators */
void ui_view2d_operatortypes(void);
Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d.c
===
--- branches/blender2.5/blender/source/blender/editors/interface/view2d.c
2008-12-15 17:47:57 UTC (rev 17877)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d.c
2008-12-15 18:09:55 UTC (rev 17878)
@@ -1466,3 +1466,18 @@
if (x) *x = (v2d->mask.xmax - v2d->mask.xmin) / (v2d->cur.xmax -
v2d->cur.xmin);
if (y) *y = (v2d->mask.ymax - v2d->mask.ymin) / (v2d->cur.ymax -
v2d->cur.ymin);
}
+
+
+void UI_view2d_sync(View2D *v2d, View2D *v2dfrom, int flag)
+{
+
+ if(flag == V2D_LOCK_COPY) {
+ v2d->cur.xmin= v2dfrom->cur.xmin;
+ v2d->cur.xmax= v2dfrom->cur.xmax;
+ }
+ else {
+ v2dfrom->cur.xmin= v2d->cur.xmin;
+ v2dfrom->cur.xmax= v2d->cur.xmax;
+ }
+}
+
Modified:
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
===
--- branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
2008-12-15 17:47:57 UTC (rev 17877)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
2008-12-15 18:09:55 UTC (rev 17878)
@@ -165,7 +165,8 @@
/* request updates to be done... */
WM_event_add_notifier(C, WM_NOTE_AREA_REDRAW, 0, NULL);
- /* XXX: add WM_NOTE_TIME_CHANGED? */
+ if(v2d->flag & V2D_VIEWSYNC_X)
+ WM_event_add_notifier(C, WM_NOTE_TIMELINE_SYNC, V2D_LOCK_COPY,
v2d);
}
/* cleanup temp customdata */
@@ -493,7 +494,8 @@
/* request updates to be done... */
WM_event_add_notifier(C, WM_NOTE_AREA_REDRAW, 0, NULL);
- /* XXX: add WM_NOTE_TIME_CHANGED? */
+ if(v2d->flag & V2D_VIEWSYNC_X)
+ WM_event_add_notifier(C, WM_NOTE_TIMELINE_SYNC, V2D_LOCK_COPY,
v2d);
}
/* --- Individual Operators --- */
@@ -645,7 +647,8 @@
/* request updates to be done... */
WM_event_add_notifier(C, WM_NOTE_AREA_REDRAW, 0, NULL);
- /* XXX: add WM_NOTE_TIME_CHANGED? */
+ if(v2d->flag & V2D_VIEWSYNC_X)
+ WM_event_add_notifier(C, WM_NOTE_TIMELINE_SYNC, V2D_LOCK_COPY,
v2d);
}
/* cleanup temp customdata */
@@ -1025,7 +1028,8 @@
/* request updates to be done... */
WM_event_add_notifier(C, WM_NOTE_AREA_REDRAW, 0, NULL);
- /* XXX: add WM_NOTE_TIME_CHANGED? */
+ if(v2d->flag & V2D_VIEWSYNC_X)
+ WM_event_add_notifier(C, WM_NOTE_TIMELINE_SYNC, V2D_LOCK_COPY,
v2d);
}
/* handle user input for scrollers - calculations of mouse-movement need to be
done here, not in the apply callback! */
Modified: branches/blende
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17877] trunk/blender/source/blender/imbuf /intern/openexr/CMakeLists.txt: Make sure that WITH_OPENEXR is defined when sources are configured
Revision: 17877
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17877
Author: hos
Date: 2008-12-15 18:47:57 +0100 (Mon, 15 Dec 2008)
Log Message:
---
Make sure that WITH_OPENEXR is defined when sources are configured
with OpenEXR in the CMake system. This is a compilation fix from
Miguel A. Figueroa Villanueva for building Debug versions of Blender
using OpenEXR (thanks!).
Modified Paths:
--
trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
Modified: trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
===
--- trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
2008-12-15 16:54:47 UTC (rev 17876)
+++ trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
2008-12-15 17:47:57 UTC (rev 17877)
@@ -38,5 +38,9 @@
${OPENEXR_INC}
)
+IF(WITH_OPENEXR)
+ ADD_DEFINITIONS(-DWITH_OPENEXR)
+ENDIF(WITH_OPENEXR)
+
BLENDERLIB(bf_openexr "${SRC}" "${INC}")
#env.BlenderLib ('bf_openexr', source_files, incs, defs,
libtype=['core','player'], priority = [90, 200])
___
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 [17876] branches/blender2.5/blender/source /blender: 2.5
Revision: 17876 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17876 Author: ton Date: 2008-12-15 17:54:47 +0100 (Mon, 15 Dec 2008) Log Message: --- 2.5 Mouse cursors now work again - centralized screen-level cursor changes, no more operator running for it. - spacetypes have callback to check/set individual cursor types. Use notifier SCREEN_CHANGED to make sure it works on mode changes etc. - new calls WM_cursor_modal() and WM_cursor_restore() to make temporarily cursor types during modes. - used above for view2d cursors. Modified Paths: -- branches/blender2.5/blender/source/blender/blenkernel/BKE_screen.h branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c branches/blender2.5/blender/source/blender/editors/screen/area.c branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c branches/blender2.5/blender/source/blender/editors/screen/screen_intern.h branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c branches/blender2.5/blender/source/blender/editors/space_text/space_text.c branches/blender2.5/blender/source/blender/windowmanager/WM_api.h branches/blender2.5/blender/source/blender/windowmanager/intern/wm_cursors.c branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c branches/blender2.5/blender/source/blender/windowmanager/wm_cursors.h Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_screen.h === --- branches/blender2.5/blender/source/blender/blenkernel/BKE_screen.h 2008-12-15 13:46:50 UTC (rev 17875) +++ branches/blender2.5/blender/source/blender/blenkernel/BKE_screen.h 2008-12-15 16:54:47 UTC (rev 17876) @@ -37,6 +37,7 @@ struct ARegion; struct wmNotifier; struct wmWindowManager; +struct wmWindow; struct ListBase; /* spacetype has everything stored to get an editor working, it gets initialized via @@ -69,6 +70,8 @@ void(*operatortypes)(void); /* add default items to WM keymap */ void(*keymap)(struct wmWindowManager *); + /* sets default cursor per region */ + void(*cursor)(struct wmWindow *win, struct ARegion *ar); /* region type definitions */ ListBaseregiontypes; Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c === --- branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c 2008-12-15 13:46:50 UTC (rev 17875) +++ branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c 2008-12-15 16:54:47 UTC (rev 17876) @@ -209,14 +209,12 @@ RNA_int_set(op->ptr, "deltax", 0); RNA_int_set(op->ptr, "deltay", 0); -#if 0 // XXX - enable this when cursors are working properly if (v2d->keepofs & V2D_LOCKOFS_X) - WM_set_cursor(C, BC_NS_SCROLLCURSOR); + WM_cursor_modal(C->window, BC_NS_SCROLLCURSOR); else if (v2d->keepofs & V2D_LOCKOFS_Y) - WM_set_cursor(C, BC_EW_SCROLLCURSOR); + WM_cursor_modal(C->window, BC_EW_SCROLLCURSOR); else - WM_set_cursor(C, BC_NSEW_SCROLLCURSOR); -#endif // XXX - enable this when cursors are working properly + WM_cursor_modal(C->window, BC_NSEW_SCROLLCURSOR); /* add temp handler */ WM_event_add_modal_handler(C, &C->window->handlers, op); @@ -251,7 +249,7 @@ RNA_int_set(op->ptr, "deltay", (vpd->starty - vpd->lasty)); view_pan_exit(C, op); - //WM_set_cursor(C, CURSOR_STD); // XXX - enable this when cursors are working properly + WM_cursor_restore(C->window); return OPERATOR_FINISHED; } @@ -689,14 +687,12 @@ RNA_float_set(op->ptr, "deltax", 0); RNA_float_set(op->ptr, "deltay", 0); -#if 0 // XXX - enable this when cursors are working properly if (v2d->keepofs & V2D_LOCKOFS_X) - WM_set_cursor(C, BC_NS_SCROLLCURSOR); + WM_cursor_modal(C->window, BC_NS_SCROLLCURSOR); else if (v2d->keepofs & V2D_LOCKOFS_Y) - WM_set_cursor(C, BC_EW_SCROLLCURSOR); + WM_cursor_modal(C->window, BC_EW_SCROLLCURSOR); else - WM_set_cursor(C, BC_NSEW_SCROLLCURSOR); -#endif // XXX - enable this when cursors are working properly + WM_cursor_modal(C->window, BC_NSEW_SCROLLCURSOR); /* add temp handler */ WM_event_add_modal_handler(C, &C->window
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17875] branches/blender2.5/blender/source /blender/makesrna:
Revision: 17875 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17875 Author: blendix Date: 2008-12-15 14:46:50 +0100 (Mon, 15 Dec 2008) Log Message: --- RNA: Added some functionality to make inspecting all RNA structs possible. Not used yet, but can be tested by replacing this line in space_outliner.c: RNA_main_pointer_create(G.main, &cell.ptr); with: RNA_blender_rna_pointer_create(&cell.ptr); Modified Paths: -- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_rna.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_wm.c Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h === --- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2008-12-15 13:23:55 UTC (rev 17874) +++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2008-12-15 13:46:50 UTC (rev 17875) @@ -40,13 +40,15 @@ extern StructRNA RNA_AlwaysSensor; extern StructRNA RNA_AndController; extern StructRNA RNA_Armature; +extern StructRNA RNA_BlenderRNA; +extern StructRNA RNA_Bone; extern StructRNA RNA_BooleanProperty; -extern StructRNA RNA_Bone; extern StructRNA RNA_Brush; extern StructRNA RNA_Camera; extern StructRNA RNA_CharInfo; extern StructRNA RNA_CollectionProperty; extern StructRNA RNA_CollisionSensor; +extern StructRNA RNA_ColorSequence; extern StructRNA RNA_Constraint; // ... constraint types... extern StructRNA RNA_Controller; @@ -55,6 +57,7 @@ extern StructRNA RNA_CurveMapPoint; extern StructRNA RNA_CurveMapping; extern StructRNA RNA_DelaySensor; +extern StructRNA RNA_EffectSequence; extern StructRNA RNA_EnumProperty; extern StructRNA RNA_EnumPropertyItem; extern StructRNA RNA_ExpressionController; @@ -65,11 +68,13 @@ extern StructRNA RNA_GameProperty; extern StructRNA RNA_GameStringProperty; extern StructRNA RNA_GameTimeProperty; +extern StructRNA RNA_GlowSequence; extern StructRNA RNA_Group; extern StructRNA RNA_ID; extern StructRNA RNA_IDProperty; extern StructRNA RNA_IDPropertyGroup; extern StructRNA RNA_Image; +extern StructRNA RNA_ImageSequence; extern StructRNA RNA_ImageUser; extern StructRNA RNA_IntProperty; extern StructRNA RNA_Ipo; @@ -77,7 +82,6 @@ extern StructRNA RNA_IpoDriver; extern StructRNA RNA_JoystickSensor; extern StructRNA RNA_Key; -extern StructRNA RNA_KeyBlock; extern StructRNA RNA_KeyboardSensor; extern StructRNA RNA_Lamp; extern StructRNA RNA_Lattice; @@ -104,8 +108,10 @@ extern StructRNA RNA_MessageSensor; extern StructRNA RNA_MetaBall; extern StructRNA RNA_MetaElement; -extern StructRNA RNA_ModifierData; +extern StructRNA RNA_MetaSequence; +extern StructRNA RNA_Modifier; extern StructRNA RNA_MouseSensor; +extern StructRNA RNA_MovieSequence; extern StructRNA RNA_NandController; extern StructRNA RNA_NearSensor; extern StructRNA RNA_Node; @@ -116,6 +122,7 @@ extern StructRNA RNA_OrController; extern StructRNA RNA_PackedFile; extern StructRNA RNA_Panel; +extern StructRNA RNA_PluginSequence; extern StructRNA RNA_PointerProperty; extern StructRNA RNA_Property; extern StructRNA RNA_PropertySensor; @@ -126,18 +133,34 @@ extern StructRNA RNA_RaySensor; extern StructRNA RNA_Region; extern StructRNA RNA_Scene; +extern StructRNA RNA_SceneSequence; extern StructRNA RNA_ScrArea; extern StructRNA RNA_ScrEdge; extern StructRNA RNA_ScrVert; extern StructRNA RNA_Screen; extern StructRNA RNA_Sensor; +extern StructRNA RNA_Sequence; +extern StructRNA RNA_SequenceColorBalance; +extern StructRNA RNA_SequenceCrop; +extern StructRNA RNA_SequenceEditor; +extern StructRNA RNA_SequenceElement; +extern StructRNA RNA_SequenceProxy; +extern StructRNA RNA_SequenceTransform; +extern StructRNA RNA_ShapeKey; +extern StructRNA RNA_ShapeKeyBezierPoint; +extern StructRNA RNA_ShapeKeyCurvePoint; +extern StructRNA RNA_ShapeKeyPoint; +extern StructRNA RNA_SoundSequence; +extern StructRNA RNA_SpeedControlSequence; extern StructRNA RNA_StringProperty; extern StructRNA RNA_Struct; extern StructRNA RNA_TextBox; extern StructRNA RNA_TouchSensor; +extern StructRNA RNA_TransformSequence; extern StructRNA RNA_UnknownType; extern StructRNA RNA_VectorFont; extern StructRNA RNA_WindowManager; +extern StructRNA RNA_WipeSequence; extern StructRNA RNA_World; extern StructRNA RNA_XnorController; extern StructRNA RNA_XorController; @@ -149,12 +172,16 @@ * - a pointer to a datablock can be created with the type and id data pointer * - a pointer to data contained in a datablock can be created with the id type * and id data pointer, and the data type and pointer to the struct itself. + * + * There is also a way to get a pointer with the information about all structs. */ void RNA_main_pointer_create(struct Main *main
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17874] branches/blender2.5/blender/source /blender: 2.5
Revision: 17874 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17874 Author: ton Date: 2008-12-15 14:23:55 +0100 (Mon, 15 Dec 2008) Log Message: --- 2.5 - depricated area "headbutofs" and "headbutlen", which is now fully replaced with view2d handling. - needed to add header default V2D_ALIGN_NO_NEG_Y, V2D_LOCKOFS_Y seems to not do anything atm :) - new: running blender in debug (blender -d) will print the current handler and operator in use (not mousemove) Modified Paths: -- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c branches/blender2.5/blender/source/blender/editors/interface/view2d.c branches/blender2.5/blender/source/blender/editors/space_action/action_header.c branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c branches/blender2.5/blender/source/blender/editors/space_file/file_header.c branches/blender2.5/blender/source/blender/editors/space_image/image_header.c branches/blender2.5/blender/source/blender/editors/space_info/info_header.c branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_header.c branches/blender2.5/blender/source/blender/editors/space_nla/nla_header.c branches/blender2.5/blender/source/blender/editors/space_node/node_header.c branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c branches/blender2.5/blender/source/blender/editors/space_script/script_header.c branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c branches/blender2.5/blender/source/blender/editors/space_sound/sound_header.c branches/blender2.5/blender/source/blender/editors/space_text/text_header.c branches/blender2.5/blender/source/blender/editors/space_time/time_header.c branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c branches/blender2.5/blender/source/blender/makesdna/DNA_screen_types.h branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c === --- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2008-12-15 13:10:29 UTC (rev 17873) +++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2008-12-15 13:23:55 UTC (rev 17874) @@ -5062,7 +5062,7 @@ ar->v2d.keepzoom = (V2D_LOCKZOOM_X|V2D_LOCKZOOM_Y|V2D_KEEPZOOM|V2D_KEEPASPECT); ar->v2d.keepofs = V2D_LOCKOFS_Y; ar->v2d.keeptot = 2; // this keeps the view in place when region size changes... - ar->v2d.align = V2D_ALIGN_NO_NEG_X; + ar->v2d.align = V2D_ALIGN_NO_NEG_X|V2D_ALIGN_NO_NEG_Y; } Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d.c === --- branches/blender2.5/blender/source/blender/editors/interface/view2d.c 2008-12-15 13:10:29 UTC (rev 17873) +++ branches/blender2.5/blender/source/blender/editors/interface/view2d.c 2008-12-15 13:23:55 UTC (rev 17874) @@ -72,7 +72,7 @@ v2d->keepzoom = (V2D_LOCKZOOM_X|V2D_LOCKZOOM_Y|V2D_KEEPZOOM|V2D_KEEPASPECT); v2d->keepofs = V2D_LOCKOFS_Y; v2d->keeptot = 2; // this keeps the view in place when region size changes... - v2d->align = V2D_ALIGN_NO_NEG_X; + v2d->align = V2D_ALIGN_NO_NEG_X|V2D_ALIGN_NO_NEG_Y; } Modified: branches/blender2.5/blender/source/blender/editors/space_action/action_header.c === --- branches/blender2.5/blender/source/blender/editors/space_action/action_header.c 2008-12-15 13:10:29 UTC (rev 17873) +++ branches/blender2.5/blender/source/blender/editors/space_action/action_header.c 2008-12-15 13:23:55 UTC (rev 17874) @@ -123,7 +123,7 @@ uiBlockSetEmboss(block, UI_EMBOSS); /* always as last */ - sa->headbutlen= xco+XIC+80; // +80 because the last button is not an icon + UI_view2d_totRect_set(&ar->v2d, xco+XIC+80, ar->v2d.tot.ymax-ar->v2d.tot.ymin); uiEndBlock(C, block); uiDrawBlock(block); Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c === --- branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c 2008-12-15 13:10:29 UTC (rev 17873) +++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c 2008-12-15 13:23:55 UTC (rev 17874) @@ -191,7 +191,7 @@ /* always as last */ - sa->headbutlen= xco+XIC+80; // +80 because the last button is not an i
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17873] branches/blender2.5/blender/source /blender:
Revision: 17873
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17873
Author: blendix
Date: 2008-12-15 14:10:29 +0100 (Mon, 15 Dec 2008)
Log Message:
---
2.5: added support for setting RNA properties in keymap item,
which will then be set when the operator is called, example:
kmi= WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY, KM_PRESS, 0, 0);
RNA_enum_set(kmi->ptr, "dir", 'h');
kmi= WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY, KM_PRESS,
KM_SHIFT, 0);
RNA_enum_set(kmi->ptr, "dir", 'v');
There is a hack I had to do here, since properties are defined
as member of wmOperator, will try to fix later, committing now
so it can be used already.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_wm.c
branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
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_keymap.c
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2008-12-15 11:59:42 UTC (rev 17872)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2008-12-15 13:10:29 UTC (rev 17873)
@@ -1226,13 +1226,6 @@
static int region_split_invoke(bContext *C, wmOperator *op, wmEvent *evt)
{
-
- /* can't do menu, so event is checked manually */
- if(evt->shift)
- RNA_enum_set(op->ptr, "dir", 'v');
- else
- RNA_enum_set(op->ptr, "dir", 'h');
-
return region_split_exec(C, op);
}
@@ -1374,6 +1367,7 @@
void ED_keymap_screen(wmWindowManager *wm)
{
ListBase *keymap= WM_keymap_listbase(wm, "Screen", 0, 0);
+ wmKeymapItem *kmi;
WM_keymap_verify_item(keymap, "ED_SCR_OT_cursor_type", MOUSEMOVE, 0, 0,
0);
WM_keymap_verify_item(keymap, "ED_SCR_OT_actionzone", LEFTMOUSE,
KM_PRESS, 0, 0);
@@ -1384,8 +1378,10 @@
WM_keymap_verify_item(keymap, "ED_SCR_OT_area_rip", RKEY, KM_PRESS,
KM_ALT, 0);
/* tests */
- WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY, KM_PRESS, 0,
0);
- WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY, KM_PRESS,
KM_SHIFT, 0);
+ kmi= WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY,
KM_PRESS, 0, 0);
+ RNA_enum_set(kmi->ptr, "dir", 'h');
+ kmi= WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY,
KM_PRESS, KM_SHIFT, 0);
+ RNA_enum_set(kmi->ptr, "dir", 'v');
WM_keymap_add_item(keymap, "ED_SCR_OT_region_flip", F5KEY, KM_PRESS, 0,
0);
WM_keymap_verify_item(keymap, "ED_SCR_OT_repeat_last", F4KEY, KM_PRESS,
0, 0);
}
Modified:
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
===
---
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
2008-12-15 11:59:42 UTC (rev 17872)
+++
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
2008-12-15 13:10:29 UTC (rev 17873)
@@ -142,7 +142,10 @@
typedef struct wmKeymapItem {
struct wmKeymapItem *next, *prev;
+ /* these are same order as wmOperator because RNA depends on it, fixme
XXX */
char idname[64];/* used to retrieve
operator type pointer */
+ IDProperty *properties; /* default operator properties
*/
+ struct PointerRNA *ptr; /* rna pointer to access
properties */
short type; /* event code
itself */
short val; /* 0=any,
1=click, 2=release, or wheelvalue, or... */
@@ -170,18 +173,15 @@
/* operator + operatortype should be able to redo entirely, but for different
contextes */
typedef struct wmOperator {
struct wmOperator *next, *prev;
+
+ /* saved */
+ char idname[64];/* used to retrieve type
pointer */
+ IDProperty *properties; /* saved, user-settable properties */
- wmOperatorType *type;
- char idname[64];/* used to retrieve type pointer */
-
- /* custom storage, only while operator runs, not saved */
- void *customdata;
- /* IDproperty list */
- IDProperty *properties;
-
/* runtime */
- struct PointerRNA *ptr;
- ListBase *modallist;
+ wmO
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17872] branches/blender2.5/blender/source /blender/editors/screen/screen_ops.c: 2.5
Revision: 17872
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17872
Author: ton
Date: 2008-12-15 12:59:42 +0100 (Mon, 15 Dec 2008)
Log Message:
---
2.5
Testing toy for space editor devs: press F5key in header or channel list
(or any 'alignment constrained' region to flip it to other side.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2008-12-15 11:58:57 UTC (rev 17871)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2008-12-15 11:59:42 UTC (rev 17872)
@@ -1256,7 +1256,39 @@
RNA_def_property_enum_default(prop, 'h');
}
+/* ** region flip operator * */
+/* flip a region alignment */
+static int region_flip_exec(bContext *C, wmOperator *op)
+{
+ if(C->region->alignment==RGN_ALIGN_TOP)
+ C->region->alignment= RGN_ALIGN_BOTTOM;
+ else if(C->region->alignment==RGN_ALIGN_BOTTOM)
+ C->region->alignment= RGN_ALIGN_TOP;
+ else if(C->region->alignment==RGN_ALIGN_LEFT)
+ C->region->alignment= RGN_ALIGN_RIGHT;
+ else if(C->region->alignment==RGN_ALIGN_RIGHT)
+ C->region->alignment= RGN_ALIGN_LEFT;
+
+ WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
+
+ return OPERATOR_FINISHED;
+}
+
+void ED_SCR_OT_region_flip(wmOperatorType *ot)
+{
+
+ /* identifiers */
+ ot->name= "Flip Region";
+ ot->idname= "ED_SCR_OT_region_flip";
+
+ /* api callbacks */
+ ot->exec= region_flip_exec;
+
+ ot->poll= ED_operator_areaactive;
+}
+
+
/* ** border select operator (template)
* */
/* operator state vars used: (added by default WM callbacks)
@@ -1331,6 +1363,7 @@
WM_operatortype_append(ED_SCR_OT_area_join);
WM_operatortype_append(ED_SCR_OT_area_rip);
WM_operatortype_append(ED_SCR_OT_region_split);
+ WM_operatortype_append(ED_SCR_OT_region_flip);
/* tools shared by more space types */
ED_marker_operatortypes();
@@ -1353,6 +1386,7 @@
/* tests */
WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY, KM_PRESS, 0,
0);
WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY, KM_PRESS,
KM_SHIFT, 0);
+ WM_keymap_add_item(keymap, "ED_SCR_OT_region_flip", F5KEY, KM_PRESS, 0,
0);
WM_keymap_verify_item(keymap, "ED_SCR_OT_repeat_last", F4KEY, 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 [17871] branches/blender2.5/blender/source /blender: View2D: Simplification and documentation of settings
Revision: 17871 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17871 Author: aligorith Date: 2008-12-15 12:58:57 +0100 (Mon, 15 Dec 2008) Log Message: --- View2D: Simplification and documentation of settings I've gone through and simplified some of the redundant options while documenting the various settings (in the code and also in the Wiki Doc), to make it clearer how to use each option. 'Preset' view-types have yet to be fully implemented, but started groundwork for this. Only some commonly used view configurations will be defined using this method. For all others, they still need to define all relavent view settings themselves (as there's too much variation in terms of the various editor's use of View2D). IPO Editor now draws with channels on the left, like all other anim editors. Now, how to make this wider... Modified Paths: -- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c branches/blender2.5/blender/source/blender/editors/include/UI_view2d.h branches/blender2.5/blender/source/blender/editors/interface/view2d.c branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c branches/blender2.5/blender/source/blender/editors/space_action/space_action.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_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/makesdna/DNA_view2d_types.h Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c === --- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2008-12-15 11:45:17 UTC (rev 17870) +++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2008-12-15 11:58:57 UTC (rev 17871) @@ -5078,7 +5078,7 @@ ar= MEM_callocN(sizeof(ARegion), "area region from do_versions"); BLI_addtail(lb, ar); ar->regiontype= RGN_TYPE_CHANNELS; - ar->alignment= RGN_ALIGN_RIGHT; + ar->alignment= RGN_ALIGN_LEFT; break; case SPACE_ACTION: @@ -5113,7 +5113,7 @@ memcpy(&ar->v2d, &soops->v2d, sizeof(View2D)); ar->v2d.scroll &= ~V2D_SCROLL_LEFT; - ar->v2d.scroll |= (V2D_SCROLL_RIGHT|V2D_SCROLL_HORIZONTAL_O); + ar->v2d.scroll |= (V2D_SCROLL_RIGHT|V2D_SCROLL_BOTTOM_O); ar->v2d.align = (V2D_ALIGN_NO_NEG_X|V2D_ALIGN_NO_POS_Y); ar->v2d.keepzoom |= (V2D_LOCKZOOM_X|V2D_LOCKZOOM_Y|V2D_KEEPASPECT); ar->v2d.keeptot = 2; @@ -5124,7 +5124,7 @@ SpaceTime *stime= (SpaceTime *)sl; memcpy(&ar->v2d, &stime->v2d, sizeof(View2D)); - ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM); + ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_HORIZONTAL); ar->v2d.align |= V2D_ALIGN_NO_NEG_Y; ar->v2d.keepofs |= V2D_LOCKOFS_Y; ar->v2d.keepzoom |= V2D_LOCKZOOM_Y; @@ -5137,8 +5137,8 @@ SpaceIpo *sipo= (SpaceIpo *)sl; memcpy(&ar->v2d, &sipo->v2d, sizeof(View2D)); - ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM); - ar->v2d.scroll |= (V2D_SCROLL_LEFT|V2D_SCROLL_SCALE_LEFT); + ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_HORIZONTAL); + ar->v2d.scroll |= (V2D_SCROLL_LEFT|V2D_SCROLL_SCALE_VERTICAL); break; } case SPACE_SOUND: @@ -5146,7 +5146,7 @@ SpaceSound *ssound= (SpaceSound *)sl; memcpy(&ar->v2d, &ssound->v2d, sizeof(View2D)); - ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM); + ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_HORIZONTAL);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17870] branches/blender2.5/blender/source /blender/windowmanager: 2.5
Revision: 17870
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17870
Author: ton
Date: 2008-12-15 12:45:17 +0100 (Mon, 15 Dec 2008)
Log Message:
---
2.5
funtion WM_keymap_add_item() now returns keymap-item, so you can use it
to set default properties for operators with WM_keymap_property_set().
Brecht will fill in this function, requires rna magic!
Example: an operator ED_OB_OT_add_primitive can be configured with
keymap like this:
WM_keymap_property_set(keymapitem, "Primitivetype", "Sphere");
Similar conventions we can use later for button/menu calls.
This will make creating operators easier, allowing a developer to group
tools functionality nicely.
Modified Paths:
--
branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_keymap.c
Modified: branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
===
--- branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
2008-12-15 10:48:04 UTC (rev 17869)
+++ branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
2008-12-15 11:45:17 UTC (rev 17870)
@@ -61,12 +61,13 @@
void WM_timecursor (struct bContext *C, int nr);
/* keymap and handlers */
-void WM_keymap_set_item (ListBase *lb, char *idname, short
type,
+wmKeymapItem *WM_keymap_set_item (ListBase *lb, char *idname, short
type,
short val, int
modifier, short keymodifier);
-void WM_keymap_verify_item(ListBase *lb, char *idname, short type,
+wmKeymapItem *WM_keymap_verify_item(ListBase *lb, char *idname, short type,
short val, int
modifier, short keymodifier);
-void WM_keymap_add_item (ListBase *lb, char *idname, short
type,
+wmKeymapItem *WM_keymap_add_item (ListBase *lb, char *idname, short
type,
short val, int
modifier, short keymodifier);
+void WM_keymap_property_set(wmKeymapItem *km, const char *propname,
const char *propval);
ListBase *WM_keymap_listbase (wmWindowManager *wm, const char
*nameid,
int spaceid,
int regionid);
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
2008-12-15 10:48:04 UTC (rev 17869)
+++
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
2008-12-15 11:45:17 UTC (rev 17870)
@@ -643,6 +643,7 @@
ARegion *ar;
int doit= 0;
+ /* XXX to solve, here screen handlers? */
ED_screen_set_subwinactive(win);/*
state variables in screen */
for(sa= win->screen->areabase.first; sa; sa=
sa->next) {
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_keymap.c
===
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_keymap.c
2008-12-15 10:48:04 UTC (rev 17869)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_keymap.c
2008-12-15 11:45:17 UTC (rev 17870)
@@ -72,7 +72,7 @@
}
/* if item was added, then bail out */
-void WM_keymap_verify_item(ListBase *lb, char *idname, short type, short val,
int modifier, short keymodifier)
+wmKeymapItem *WM_keymap_verify_item(ListBase *lb, char *idname, short type,
short val, int modifier, short keymodifier)
{
wmKeymapItem *kmi;
@@ -87,11 +87,11 @@
keymap_set(kmi, type, val, modifier, keymodifier);
}
-
+ return kmi;
}
/* if item was added, then replace */
-void WM_keymap_set_item(ListBase *lb, char *idname, short type, short val, int
modifier, short keymodifier)
+wmKeymapItem *WM_keymap_set_item(ListBase *lb, char *idname, short type, short
val, int modifier, short keymodifier)
{
wmKeymapItem *kmi;
@@ -105,10 +105,11 @@
BLI_strncpy(kmi->idname, idname, OP_MAX_TYPENAME);
}
keymap_set(kmi, type, val, modifier, keymodifier);
+ return kmi;
}
/* always add item */
-void WM_keymap_add_item(ListBase *lb, char *idname, short type, short val, int
modifier, short keymodifier)
+wmKeymapItem *WM_keymap_add_ite
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17869] branches/blender2.5/blender/source /blender:
Revision: 17869
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17869
Author: blendix
Date: 2008-12-15 11:48:04 +0100 (Mon, 15 Dec 2008)
Log Message:
---
RNA:
* DNA_sequence_types.h done, patch by Roelf de Kock, with various changes,
mainly the use of inheritance for different sequence types and hiding the
separate Strip struct.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c
branches/blender2.5/blender/source/blender/makesdna/DNA_sequence_types.h
branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
Added Paths:
---
branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c
===
---
branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c
2008-12-15 08:37:39 UTC (rev 17868)
+++
branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c
2008-12-15 10:48:04 UTC (rev 17869)
@@ -230,7 +230,8 @@
if(nameprop)
nameptr= RNA_property_string_get_alloc(&lookup,
nameprop, name, sizeof(name));
- else
+
+ if(!nameprop || strlen(nameptr) == 0)
sprintf(nameptr, "%d", cell->index+1);
}
Modified:
branches/blender2.5/blender/source/blender/makesdna/DNA_sequence_types.h
===
--- branches/blender2.5/blender/source/blender/makesdna/DNA_sequence_types.h
2008-12-15 08:37:39 UTC (rev 17868)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_sequence_types.h
2008-12-15 10:48:04 UTC (rev 17869)
@@ -182,9 +182,6 @@
ListBase *seqbasep;
ListBase seqbase;
ListBase metastack;
- short flag;
- short pad;
- int rt;
} Editing;
/* * Effect Variable Structs * */
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
===
--- branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
2008-12-15 08:37:39 UTC (rev 17868)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
2008-12-15 10:48:04 UTC (rev 17869)
@@ -62,10 +62,11 @@
PROP_NONE = 0,
PROP_UNSIGNED = 1,
PROP_FILEPATH = 2,
- PROP_COLOR = 3,
- PROP_VECTOR = 4,
- PROP_MATRIX = 5,
- PROP_ROTATION = 6
+ PROP_DIRPATH = 3,
+ PROP_COLOR = 4,
+ PROP_VECTOR = 5,
+ PROP_MATRIX = 6,
+ PROP_ROTATION = 7
} PropertySubType;
typedef enum PropertyFlag {
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2008-12-15 08:37:39 UTC (rev 17868)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2008-12-15 10:48:04 UTC (rev 17869)
@@ -638,6 +638,7 @@
case PROP_NONE: return "PROP_NONE";
case PROP_UNSIGNED: return "PROP_UNSIGNED";
case PROP_FILEPATH: return "PROP_FILEPATH";
+ case PROP_DIRPATH: return "PROP_DIRPATH";
case PROP_COLOR: return "PROP_COLOR";
case PROP_VECTOR: return "PROP_VECTOR";
case PROP_MATRIX: return "PROP_MATRIX";
@@ -921,6 +922,7 @@
{"rna_scene.c", RNA_def_scene},
{"rna_screen.c", RNA_def_screen},
{"rna_sensor.c", RNA_def_sensor},
+ {"rna_sequence.c", RNA_def_sequence},
{"rna_vfont.c", RNA_def_vfont},
{"rna_wm.c", RNA_def_wm},
{"rna_world.c", RNA_def_world},
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
===
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
2008-12-15 08:37:39 UTC (rev 17868)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
2008-12-15 10:48:04 UTC (rev 17869)
@@ -162,7 +162,7 @@
RNA_def_property_flag(prop, PROP_NOT_EDITABLE); /* must be unique */
RNA_def_property_ui_text(prop, "Name", "Unique datablock ID name.");
RNA_def_property_string_funcs(prop, "rna_ID_name_get",
"rna_ID_name_length", "rna_ID_name_set");
- RNA_def_property_string_ma
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17868] trunk/blender/source/blender/nodes /intern/CMP_nodes/CMP_filter.c: bugfix #17989
Revision: 17868
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17868
Author: ton
Date: 2008-12-15 09:37:39 +0100 (Mon, 15 Dec 2008)
Log Message:
---
bugfix #17989
Patch from Xavier Thomas.
Compositor, filter node, had shifted output when used on single-value
buffers.
Modified Paths:
--
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
===
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
2008-12-15 08:29:31 UTC (rev 17867)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
2008-12-15 08:37:39 UTC (rev 17868)
@@ -78,6 +78,7 @@
QUATCOPY(fp, row2+4);
}
else if(pix==CB_VAL) {
+ fp+= pix;
for(x=2; xhttp://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17867] trunk/blender/source/blender/ render/intern/source/pipeline.c: Touch/ NoOverwrite options were not disabled for video.
Revision: 17867
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17867
Author: campbellbarton
Date: 2008-12-15 09:29:31 +0100 (Mon, 15 Dec 2008)
Log Message:
---
Touch/NoOverwrite options were not disabled for video.
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2008-12-15 05:49:56 UTC (rev 17866)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2008-12-15 08:29:31 UTC (rev 17867)
@@ -2616,18 +2616,21 @@
else
nfra+= tfra;
- if (scene->r.mode & (R_NO_OVERWRITE | R_TOUCH) ) {
- BKE_makepicstring(name, scene->r.pic,
scene->r.cfra, scene->r.imtype);
+ /* Touch/NoOverwrite options are only valid for image's
*/
+ if(BKE_imtype_is_movie(scene->r.imtype) == 0) {
+ if (scene->r.mode & (R_NO_OVERWRITE | R_TOUCH)
) {
+ BKE_makepicstring(name, scene->r.pic,
scene->r.cfra, scene->r.imtype);
+ }
+
+ if (scene->r.mode & R_NO_OVERWRITE &&
BLI_exist(name)) {
+ printf("skipping existing frame
\"%s\"\n", name);
+ continue;
+ }
+ if (scene->r.mode & R_TOUCH &&
!BLI_exist(name)) {
+ BLI_make_existing_file(name); /* makes
the dir if its not there */
+ BLI_touch(name);
+ }
}
-
- if (scene->r.mode & R_NO_OVERWRITE && BLI_exist(name)) {
- printf("skipping existing frame \"%s\"\n",
name);
- continue;
- }
- if (scene->r.mode & R_TOUCH && !BLI_exist(name)) {
- BLI_make_existing_file(name); /* makes the dir
if its not there */
- BLI_touch(name);
- }
re->r.cfra= scene->r.cfra; /* weak */
@@ -2639,8 +2642,10 @@
if(G.afbreek==1) {
/* remove touched file */
- if (scene->r.mode & R_TOUCH && BLI_exist(name)
&& BLI_filepathsize(name) == 0) {
- BLI_delete(name, 0, 0);
+ if(BKE_imtype_is_movie(scene->r.imtype) == 0) {
+ if (scene->r.mode & R_TOUCH &&
BLI_exist(name) && BLI_filepathsize(name) == 0) {
+ BLI_delete(name, 0, 0);
+ }
}
break;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
