[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15731] branches/apricot/source: svn merge -r15708:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Campbell Barton
ideasman42 at gmail.com
Thu Jul 24 09:06:32 CEST 2008
Revision: 15731
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15731
Author: campbellbarton
Date: 2008-07-24 09:06:27 +0200 (Thu, 24 Jul 2008)
Log Message:
-----------
svn merge -r15708:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/apricot/source/blender/blenloader/intern/readfile.c
branches/apricot/source/blender/include/BDR_gpencil.h
branches/apricot/source/blender/include/BIF_editaction.h
branches/apricot/source/blender/include/BSE_drawview.h
branches/apricot/source/blender/makesdna/DNA_action_types.h
branches/apricot/source/blender/makesdna/DNA_actuator_types.h
branches/apricot/source/blender/makesdna/DNA_gpencil_types.h
branches/apricot/source/blender/src/buttons_editing.c
branches/apricot/source/blender/src/buttons_logic.c
branches/apricot/source/blender/src/drawaction.c
branches/apricot/source/blender/src/drawgpencil.c
branches/apricot/source/blender/src/drawnode.c
branches/apricot/source/blender/src/drawseq.c
branches/apricot/source/blender/src/drawview.c
branches/apricot/source/blender/src/editaction.c
branches/apricot/source/blender/src/editaction_gpencil.c
branches/apricot/source/blender/src/gpencil.c
branches/apricot/source/blender/src/header_action.c
branches/apricot/source/blender/src/interface.c
branches/apricot/source/blender/src/interface_draw.c
branches/apricot/source/blender/src/outliner.c
branches/apricot/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/apricot/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/apricot/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/apricot/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/apricot/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/apricot/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/apricot/source/gameengine/GameLogic/SCA_ISensor.h
branches/apricot/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/apricot/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/apricot/source/gameengine/Ketsji/KX_GameObject.cpp
branches/apricot/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/apricot/source/gameengine/Ketsji/KX_IpoActuator.h
branches/apricot/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/apricot/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/apricot/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/apricot/source/gameengine/PyDoc/KX_ConstraintActuator.py
branches/apricot/source/gameengine/PyDoc/KX_IpoActuator.py
branches/apricot/source/gameengine/PyDoc/KX_ObjectActuator.py
branches/apricot/source/gameengine/PyDoc/SCA_ISensor.py
Added Paths:
-----------
branches/apricot/source/gameengine/PyDoc/BL_ShapeActionActuator.py
branches/apricot/source/gameengine/PyDoc/KX_ActuatorSensor.py
branches/apricot/source/gameengine/PyDoc/KX_StateActuator.py
Modified: branches/apricot/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/apricot/source/blender/blenloader/intern/readfile.c 2008-07-24 06:21:33 UTC (rev 15730)
+++ branches/apricot/source/blender/blenloader/intern/readfile.c 2008-07-24 07:06:27 UTC (rev 15731)
@@ -4190,15 +4190,6 @@
link_gpencil(fd, sseq->gpd);
}
}
- else if(sl->spacetype==SPACE_ACTION) {
- SpaceAction *sact= (SpaceAction *)sl;
-
- /* WARNING: action-editor doesn't have it's own gpencil data!
- * so only adjust pointer, but DON'T LINK
- */
- if (sact->gpd)
- sact->gpd= newdataadr(fd, sact->gpd);
- }
}
sa->v1= newdataadr(fd, sa->v1);
Modified: branches/apricot/source/blender/include/BDR_gpencil.h
===================================================================
--- branches/apricot/source/blender/include/BDR_gpencil.h 2008-07-24 06:21:33 UTC (rev 15730)
+++ branches/apricot/source/blender/include/BDR_gpencil.h 2008-07-24 07:06:27 UTC (rev 15731)
@@ -53,8 +53,6 @@
struct bGPdata *gpencil_data_getactive(struct ScrArea *sa);
short gpencil_data_setactive(struct ScrArea *sa, struct bGPdata *gpd);
-struct bGPdata *gpencil_data_getetime(struct bScreen *sc);
-void gpencil_data_setetime(struct bScreen *sc, struct bGPdata *gpd);
void gpencil_frame_delete_laststroke(struct bGPDframe *gpf);
Modified: branches/apricot/source/blender/include/BIF_editaction.h
===================================================================
--- branches/apricot/source/blender/include/BIF_editaction.h 2008-07-24 06:21:33 UTC (rev 15730)
+++ branches/apricot/source/blender/include/BIF_editaction.h 2008-07-24 07:06:27 UTC (rev 15731)
@@ -49,7 +49,9 @@
ACTTYPE_FILLCON,
ACTTYPE_IPO,
ACTTYPE_SHAPEKEY,
- ACTTYPE_GPLAYER
+ ACTTYPE_GPDATABLOCK,
+ ACTTYPE_GPLAYER,
+ ACTTYPE_SPECIALDATA
};
/* Macros for easier/more consistant state testing */
@@ -70,6 +72,8 @@
#define EDITABLE_ICU(icu) ((icu->flag & IPO_PROTECT)==0)
#define SEL_ICU(icu) (icu->flag & IPO_SELECT)
+#define EXPANDED_GPD(gpd) (gpd->flag & GP_DATA_EXPAND)
+
#define EDITABLE_GPL(gpl) ((gpl->flag & GP_LAYER_LOCKED)==0)
#define SEL_GPL(gpl) ((gpl->flag & GP_LAYER_ACTIVE) || (gpl->flag & GP_LAYER_SELECT))
@@ -185,7 +189,7 @@
/* Grease-Pencil Data */
void gplayer_make_cfra_list(struct bGPDlayer *gpl, ListBase *elems, short onlysel);
-void deselect_gpencil_layers(struct bGPdata *gpd, short select_mode);
+void deselect_gpencil_layers(void *data, short select_mode);
short is_gplayer_frame_selected(struct bGPDlayer *gpl);
void set_gplayer_frame_selection(struct bGPDlayer *gpl, short mode);
@@ -204,7 +208,7 @@
struct Key *get_action_mesh_key(void);
int get_nearest_key_num(struct Key *key, short *mval, float *x);
-void *get_nearest_act_channel(short mval[], short *ret_type);
+void *get_nearest_act_channel(short mval[], short *ret_type, void **owner);
/* Action */
struct bActionChannel *get_hilighted_action_channel(struct bAction* action);
Modified: branches/apricot/source/blender/include/BSE_drawview.h
===================================================================
--- branches/apricot/source/blender/include/BSE_drawview.h 2008-07-24 06:21:33 UTC (rev 15730)
+++ branches/apricot/source/blender/include/BSE_drawview.h 2008-07-24 07:06:27 UTC (rev 15731)
@@ -74,6 +74,7 @@
int play_anim(int mode);
void make_axis_color(char *col, char *col2, char axis);
+char *view3d_get_name(struct View3D *v3d);
/* SMOOTHVIEW */
void smooth_view(struct View3D *v3d, float *ofs, float *quat, float *dist, float *lens);
Modified: branches/apricot/source/blender/makesdna/DNA_action_types.h
===================================================================
--- branches/apricot/source/blender/makesdna/DNA_action_types.h 2008-07-24 06:21:33 UTC (rev 15730)
+++ branches/apricot/source/blender/makesdna/DNA_action_types.h 2008-07-24 07:06:27 UTC (rev 15731)
@@ -184,7 +184,6 @@
View2D v2d;
bAction *action; /* the currently active action */
- bGPdata *gpd; /* the currently active gpencil block (for editing) */
char mode, autosnap; /* mode: editing context; autosnap: automatic keyframe snapping mode */
short flag, actnr; /* flag: bitmapped settings; */
Modified: branches/apricot/source/blender/makesdna/DNA_actuator_types.h
===================================================================
--- branches/apricot/source/blender/makesdna/DNA_actuator_types.h 2008-07-24 06:21:33 UTC (rev 15730)
+++ branches/apricot/source/blender/makesdna/DNA_actuator_types.h 2008-07-24 07:06:27 UTC (rev 15731)
@@ -368,9 +368,9 @@
#define ACT_CONST_DIRPX 1
#define ACT_CONST_DIRPY 2
#define ACT_CONST_DIRPZ 4
-#define ACT_CONST_DIRMX 8
-#define ACT_CONST_DIRMY 16
-#define ACT_CONST_DIRMZ 32
+#define ACT_CONST_DIRNX 8
+#define ACT_CONST_DIRNY 16
+#define ACT_CONST_DIRNZ 32
/* constraint type */
#define ACT_CONST_TYPE_LOC 0
Modified: branches/apricot/source/blender/makesdna/DNA_gpencil_types.h
===================================================================
--- branches/apricot/source/blender/makesdna/DNA_gpencil_types.h 2008-07-24 06:21:33 UTC (rev 15730)
+++ branches/apricot/source/blender/makesdna/DNA_gpencil_types.h 2008-07-24 07:06:27 UTC (rev 15731)
@@ -131,8 +131,8 @@
#define GP_DATA_DISP (1<<0)
/* show debugging info in viewport (i.e. status print) */
#define GP_DATA_DISPINFO (1<<1)
- /* is the block being shown in Action Editor */
-#define GP_DATA_EDITTIME (1<<2)
+ /* in Action Editor, show as expanded channel */
+#define GP_DATA_EXPAND (1<<2)
/* is the block overriding all clicks? */
#define GP_DATA_EDITPAINT (1<<3)
/* new strokes are added in viewport space */
Modified: branches/apricot/source/blender/src/buttons_editing.c
===================================================================
--- branches/apricot/source/blender/src/buttons_editing.c 2008-07-24 06:21:33 UTC (rev 15730)
+++ branches/apricot/source/blender/src/buttons_editing.c 2008-07-24 07:06:27 UTC (rev 15731)
@@ -1929,7 +1929,7 @@
uiBlockBeginAlign(block);
uiDefButF(block, NUM, B_MODIFIER_RECALC, "Width: ",
lx, (cy -= 19), buttonWidth, 19, &bmd->value,
- 0.0, 0.5, 5, 2,
+ 0.0, 0.5, 5, 4,
"Bevel value/amount");
/*uiDefButI(block, NUM, B_MODIFIER_RECALC, "Recurs",
lx, (cy -= 19), buttonWidth, 19, &bmd->res,
Modified: branches/apricot/source/blender/src/buttons_logic.c
===================================================================
--- branches/apricot/source/blender/src/buttons_logic.c 2008-07-24 06:21:33 UTC (rev 15730)
+++ branches/apricot/source/blender/src/buttons_logic.c 2008-07-24 07:06:27 UTC (rev 15731)
@@ -2088,8 +2088,8 @@
uiDefBut(block, LABEL, 0, "Range", xco+80, yco-45, (width-115)/2, 19, NULL, 0.0, 0.0, 0, 0, "Set the maximum length of ray");
uiDefButBitS(block, TOG, ACT_CONST_DISTANCE, B_REDR, "Dist", xco+80+(width-115)/2, yco-45, (width-115)/2, 19, &coa->flag, 0.0, 0.0, 0, 0, "Force distance of object to point of impact of ray");
- if(coa->mode & (ACT_CONST_DIRPX|ACT_CONST_DIRMX)) fp= coa->minloc;
- else if(coa->mode & (ACT_CONST_DIRPY|ACT_CONST_DIRMY)) fp= coa->minloc+1;
+ if(coa->mode & (ACT_CONST_DIRPX|ACT_CONST_DIRNX)) fp= coa->minloc;
+ else if(coa->mode & (ACT_CONST_DIRPY|ACT_CONST_DIRNY)) fp= coa->minloc+1;
else fp= coa->minloc+2;
uiDefButF(block, NUM, 0, "", xco+80, yco-65, (width-115)/2, 19, fp+3, 0.0, 2000.0, 10, 0, "Maximum length of ray");
Modified: branches/apricot/source/blender/src/drawaction.c
===================================================================
--- branches/apricot/source/blender/src/drawaction.c 2008-07-24 06:21:33 UTC (rev 15730)
+++ branches/apricot/source/blender/src/drawaction.c 2008-07-24 07:06:27 UTC (rev 15731)
@@ -89,6 +89,7 @@
#include "BSE_drawnla.h"
#include "BSE_drawipo.h"
+#include "BSE_drawview.h"
#include "BSE_editaction_types.h"
#include "BSE_editipo.h"
#include "BSE_time.h"
@@ -467,7 +468,7 @@
bActionGroup *grp = NULL;
short indent= 0, offset= 0, sel= 0, group=0;
int expand= -1, protect = -1, special= -1, mute = -1;
- char name[32];
+ char name[64];
/* determine what needs to be drawn */
switch (ale->type) {
@@ -625,6 +626,70 @@
sprintf(name, "Constraint");
}
break;
+ case ACTTYPE_GPDATABLOCK: /* gpencil datablock */
+ {
+ bGPdata *gpd = (bGPdata *)ale->data;
+ ScrArea *sa = (ScrArea *)ale->owner;
+
+ indent = 0;
+ group= 3;
+
+ /* only show expand if there are any channels */
+ if (gpd->layers.first) {
+ if (gpd->flag & GP_DATA_EXPAND)
+ expand = ICON_TRIA_DOWN;
+ else
+ expand = ICON_TRIA_RIGHT;
+ }
+
+ switch (sa->spacetype) {
+ case SPACE_VIEW3D:
+ {
+ /* this shouldn't cause any overflow... */
+ sprintf(name, "3D-View: <%s>", view3d_get_name(sa->spacedata.first));
+ special= ICON_VIEW3D;
+ }
+ break;
+ case SPACE_NODE:
+ {
+ SpaceNode *snode= sa->spacedata.first;
+ char treetype[12];
+
+ if (snode->treetype == 1)
+ sprintf(treetype, "Composite");
+ else
+ sprintf(treetype, "Material");
+ sprintf(name, "Nodes: %s", treetype);
+
+ special= ICON_NODE;
+ }
+ break;
+ case SPACE_SEQ:
+ {
+ SpaceSeq *sseq= sa->spacedata.first;
+ char imgpreview[10];
+
+ switch (sseq->mainb) {
+ case 1: sprintf(imgpreview, "Image..."); break;
+ case 2: sprintf(imgpreview, "Luma..."); break;
+ case 3: sprintf(imgpreview, "Chroma..."); break;
+ case 4: sprintf(imgpreview, "Histogram"); break;
+
+ default: sprintf(imgpreview, "Sequence"); break;
+ }
+ sprintf(name, "Sequencer: %s", imgpreview);
+
+ special= ICON_SEQUENCE;
+ }
+ break;
+
+ default:
+ sprintf(name, "GP-Data");
+ special= -1;
+ break;
+ }
+ }
+ break;
case ACTTYPE_GPLAYER: /* gpencil layer */
{
bGPDlayer *gpl = (bGPDlayer *)ale->data;
@@ -632,7 +697,8 @@
indent = 0;
special = -1;
expand = -1;
-
+ group = 1;
+
if (EDITABLE_GPL(gpl))
protect = ICON_UNLOCKED;
else
@@ -651,8 +717,19 @@
/* now, start drawing based on this information */
/* draw backing strip behind channel name */
- if (group == 2) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list