[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18921] trunk/blender/source/blender/src/ buttons_shading.c: Once a linked image was selected, from a texture there was no way to switch to a local im
Revision: 18921 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18921 Author: campbellbarton Date: 2009-02-11 09:16:42 +0100 (Wed, 11 Feb 2009) Log Message: --- Once a linked image was selected, from a texture there was no way to switch to a local image because the dropdown was blocked with a linked library error message. Remove linked library checking from this image selector, this isn't quite correct since the texture could be linked too, however there is no access to the texture data (or other users) when this button is drawn. Modified Paths: -- trunk/blender/source/blender/src/buttons_shading.c Modified: trunk/blender/source/blender/src/buttons_shading.c === --- trunk/blender/source/blender/src/buttons_shading.c 2009-02-11 03:46:14 UTC (rev 18920) +++ trunk/blender/source/blender/src/buttons_shading.c 2009-02-11 08:16:42 UTC (rev 18921) @@ -1126,9 +1126,10 @@ IMAnames_to_pupstring(strp, NULL, NULL, (G.main-image), NULL, iuser-menunr); uiBlockBeginAlign(block); +uiClearButLock(); /* no way to check if the image user is libdata or not, so assume its not, otherwise we cant select linked images - ANNOYING */ but= uiDefButS(block, MENU, imagechanged, strp, 10,155,23,20, iuser-menunr, 0, 0, 0, 0, Selects an existing Image or Movie); uiButSetFunc(but, image_browse_cb, ima_pp, iuser); - +uiSetButLock(ima (ima-id.lib!=NULL), ERROR_LIBDATA_MESSAGE); MEM_freeN(strp); /* name + options, or only load */ ___ 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 [18922] branches/blender2.5/blender/source /blender/blenlib: 2.5:
Revision: 18922 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18922 Author: aligorith Date: 2009-02-11 10:06:00 +0100 (Wed, 11 Feb 2009) Log Message: --- 2.5: Adding more svn eol-style props for some of the files Ton was wrangling with yesterday. Property Changed: branches/blender2.5/blender/source/blender/blenlib/BLI_listbase.h branches/blender2.5/blender/source/blender/blenlib/BLI_noise.h branches/blender2.5/blender/source/blender/blenlib/BLI_rect.h Property changes on: branches/blender2.5/blender/source/blender/blenlib/BLI_listbase.h ___ Name: svn:eol-style + native Property changes on: branches/blender2.5/blender/source/blender/blenlib/BLI_noise.h ___ Name: svn:eol-style + native Property changes on: branches/blender2.5/blender/source/blender/blenlib/BLI_rect.h ___ Name: svn:eol-style + native ___ 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 [18923] branches/blender2.5/blender/source /blender/editors/armature/editarmature.c: just a small commit with some fixes/clean ups for my previous com
Revision: 18923
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18923
Author: mfoxdogg
Date: 2009-02-11 10:12:43 +0100 (Wed, 11 Feb 2009)
Log Message:
---
just a small commit with some fixes/clean ups for my previous commit
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
Modified:
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-02-11 09:06:00 UTC (rev 18922)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-02-11 09:12:43 UTC (rev 18923)
@@ -3520,13 +3520,7 @@
/* Determine if there are any selected bones
And therefore whether we are selecting or deselecting */
- CTX_DATA_BEGIN(C, EditBone *, selbone, selected_editable_bones) {
- if (selbone-flag (BONE_SELECTED | BONE_TIPSEL |
BONE_ROOTSEL)){
- sel=0;
- break;
- }
- }
- CTX_DATA_END;
+ if (CTX_DATA_COUNT(C, selected_bones) 0) sel=0;
/* Set the flags */
for (ebone=arm-edbo-first;ebone;ebone=ebone-next) {
@@ -3545,7 +3539,7 @@
}
/* undo? */
- WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+ WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, NULL);
return OPERATOR_FINISHED;
}
@@ -4397,11 +4391,7 @@
/* Determine if there are any selected bones
And therefore whether we are selecting or deselecting */
- CTX_DATA_BEGIN(C, bPoseChannel *, selbone, selected_pchans) {
- sel=0;
- break;
- }
- CTX_DATA_END;
+ if (CTX_DATA_COUNT(C, selected_pchans) 0) sel=0;
/* Set the flags */
for (pchan= ob-pose-chanbase.first; pchan; pchan= pchan-next) {
@@ -4411,7 +4401,7 @@
}
}
- WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));
+ WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, NULL);
return OPERATOR_FINISHED;
}
___
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 [18924] branches/blender2.5/blender/source /blender: Keying Sets: Initial commit of skeleton code
Revision: 18924
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18924
Author: aligorith
Date: 2009-02-11 13:19:42 +0100 (Wed, 11 Feb 2009)
Log Message:
---
Keying Sets: Initial commit of skeleton code
When fully implemented, these will be the clearest demonstration of 'Everything
is Animateable', as they will allow users to define an arbitary group of
settings through selecting items in the Datablocks (RNA-Viewer) View of the
Outliner to define custom 'sets'. Such Keying Sets are known as the 'absolute'
ones, which are created for a custom purpose.
Of course, 'builtin' Keying Sets will still be provided. Such built-in ones
will not work on any particular paths, but will use context info to maintain
the legacy method of inserting keyframes (via IKEY menu).
Currently, KeyingSets cannot be created/edited through the UI, though the
backend code is in place to do this.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_animsys.h
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/editors/include/ED_keyframing.h
branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_intern.h
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_ops.c
branches/blender2.5/blender/source/blender/editors/space_time/time_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/blender2.5/blender/source/blender/makesdna/DNA_anim_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_animsys.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_animsys.h
2009-02-11 09:12:43 UTC (rev 18923)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_animsys.h
2009-02-11 12:19:42 UTC (rev 18924)
@@ -9,6 +9,7 @@
struct ListBase;
struct Main;
struct AnimData;
+struct KeyingSet;
/* * */
/* AnimData API */
@@ -26,6 +27,21 @@
struct AnimData *BKE_copy_animdata(struct AnimData *adt);
/* * */
+/* KeyingSets API */
+
+/* Used to create a new 'custom' KeyingSet for the user, that will be
automatically added to the stack */
+struct KeyingSet *BKE_keyingset_add(struct ListBase *list, const char name[],
short flag, short keyingflag);
+
+/* Add a destination to a KeyingSet */
+void BKE_keyingset_add_destination(struct KeyingSet *ks, struct ID *id, const
char group_name[], const char rna_path[], int array_index, int flag);
+
+/* Free data for KeyingSet but not set itself */
+void BKE_keyingset_free(struct KeyingSet *ks);
+
+/* Free all the KeyingSets in the given list */
+void BKE_keyingsets_free(struct ListBase *list);
+
+/* * */
// TODO: overrides, remapping, and path-finding api's
/* * */
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
2009-02-11 09:12:43 UTC (rev 18923)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
2009-02-11 12:19:42 UTC (rev 18924)
@@ -158,7 +158,119 @@
return dadt;
}
+/* *** */
+/* KeyingSet API */
+/* NOTES:
+ * It is very likely that there will be two copies of the api - one for
internal use,
+ * and one 'operator' based wrapper of the internal API, which should allow
for access
+ * from Python/scripts so that riggers can automate the creation of KeyingSets
for their rigs.
+ */
+
+/* Defining Tools --- */
+
+/* Used to create a new 'custom' KeyingSet for the user, that will be
automatically added to the stack */
+KeyingSet *BKE_keyingset_add (ListBase *list, const char name[], short flag,
short keyingflag)
+{
+ KeyingSet *ks;
+
+ /* allocate new KeyingSet */
+ ks=
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18925] branches/bmesh/blender/source/ blender/bmesh: split and dupe ops now spit out an edge map for finding the edge skirts.
Revision: 18925
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18925
Author: joeedh
Date: 2009-02-11 13:32:29 +0100 (Wed, 11 Feb 2009)
Log Message:
---
split and dupe ops now spit out an edge map for finding the edge skirts. still
need to implement a mapping for isolated vert splitting. note, this isn't
tested.
Modified Paths:
--
branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/bmesh/blender/source/blender/bmesh/operators/subdivideop.c
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
===
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
2009-02-11 12:19:42 UTC (rev 18924)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
2009-02-11 12:32:29 UTC (rev 18925)
@@ -83,6 +83,7 @@
void BMO_HeaderFlag_To_Slot(struct BMesh *bm, struct BMOperator *op, int
slotcode, int flag, int type);
int BMO_CountSlotBuf(struct BMesh *bm, struct BMOperator *op, int slotcode);
+/*copies data, doesn't store a reference to it.*/
void BMO_Insert_Mapping(BMesh *bm, BMOperator *op, int slotcode,
void *element, void *data, int len);
void BMO_Insert_MapFloat(BMesh *bm, BMOperator *op, int slotcode,
@@ -94,6 +95,13 @@
void BMO_Mapping_To_Flag(struct BMesh *bm, struct BMOperator *op,
int slotcode, int flag);
+/*do NOT use these for non-operator-api-allocated memory! instead
+ use BMO_Get_MapData, which copies the data.*/
+void BMO_Insert_MapPointer(BMesh *bm, BMOperator *op, int slotcode,
+ void *element, void *val);
+void *BMO_Get_MapPointer(BMesh *bm, BMOperator *op, int slotcode,
+ void *element);
+
/*if msg is null, then the default message for the errorcode is used*/
void BMOP_RaiseError(BMesh *bm, int errcode, char *msg);
/*returns error code or 0 if no error*/
@@ -119,6 +127,7 @@
enum {
BMOP_SPLIT_MULTIN,
BMOP_SPLIT_MULTOUT,
+ BMOP_SPLIT_BOUNDS_EDGEMAP,
BMOP_SPLIT_TOTSLOT,
};
@@ -129,6 +138,9 @@
BMOP_DUPE_MULTIN,
BMOP_DUPE_ORIG,
BMOP_DUPE_NEW,
+ /*we need a map for verts duplicated not connected
+ to any faces, too.*/
+ BMOP_DUPE_BOUNDS_EDGEMAP,
BMOP_DUPE_TOTSLOT
};
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
===
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
2009-02-11 12:19:42 UTC (rev 18924)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
2009-02-11 12:32:29 UTC (rev 18925)
@@ -70,14 +70,16 @@
};
BMOpDefine def_dupeop = {
- {BMOP_OPSLOT_PNT_BUF, BMOP_OPSLOT_PNT_BUF, BMOP_OPSLOT_PNT_BUF},
+ {BMOP_OPSLOT_PNT_BUF, BMOP_OPSLOT_PNT_BUF,
+BMOP_OPSLOT_PNT_BUF, BMOP_OPSLOT_MAPPING},
dupeop_exec,
BMOP_DUPE_TOTSLOT,
0
};
BMOpDefine def_splitop = {
- {BMOP_OPSLOT_PNT_BUF, BMOP_OPSLOT_PNT_BUF},
+ {BMOP_OPSLOT_PNT_BUF, BMOP_OPSLOT_PNT_BUF,
+BMOP_OPSLOT_MAPPING},
splitop_exec,
BMOP_SPLIT_TOTSLOT,
0
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
2009-02-11 12:19:42 UTC (rev 18924)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
2009-02-11 12:32:29 UTC (rev 18925)
@@ -183,13 +183,42 @@
if(source_slot-slottype != dest_slot-slottype)
return;
- if(dest_slot-slottype BMOP_OPSLOT_VEC){
- /*do buffer copy*/
- dest_slot-data.buf = NULL;
- dest_slot-len = source_slot-len;
- if(dest_slot-len){
- dest_slot-data.buf =
BLI_memarena_alloc(dest_op-arena, BMOP_OPSLOT_TYPEINFO[dest_slot-slottype] *
dest_slot-len);
- memcpy(dest_slot-data.buf, source_slot-data.buf,
BMOP_OPSLOT_TYPEINFO[dest_slot-slottype] * dest_slot-len);
+ if (dest_slot-slottype BMOP_OPSLOT_VEC) {
+ if (dest_slot-slottype != BMOP_OPSLOT_MAPPING) {
+ /*do buffer copy*/
+ dest_slot-data.buf = NULL;
+ dest_slot-len = source_slot-len;
+ if(dest_slot-len){
+ dest_slot-data.buf =
BLI_memarena_alloc(dest_op-arena, BMOP_OPSLOT_TYPEINFO[dest_slot-slottype] *
dest_slot-len);
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18926] branches/blender2.5/blender/source /blender/editors/space_outliner/outliner.c: 2.5: fix crash due to keyingset commit, ot-idname should alway
Revision: 18926
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18926
Author: blendix
Date: 2009-02-11 15:56:35 +0100 (Wed, 11 Feb 2009)
Log Message:
---
2.5: fix crash due to keyingset commit, ot-idname should always be set.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
===
---
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
2009-02-11 12:32:29 UTC (rev 18925)
+++
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
2009-02-11 14:56:35 UTC (rev 18926)
@@ -3116,7 +3116,8 @@
void OUTLINER_OT_keyingset_add_selected(wmOperatorType *ot)
{
-
+ ot-idname= OUTLINER_OT_keyingset_add_selected;
+ ot-name= Keyingset Add Selected;
}
@@ -3124,7 +3125,8 @@
void OUTLINER_OT_keyingset_remove_selected(wmOperatorType *ot)
{
-
+ ot-idname= OUTLINER_OT_keyingset_remove_selected;
+ ot-name= Keyingset Remove Selected;
}
/* * 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 [18927] branches/blender2.5/blender/source /blender/editors/armature: First operator done as a test and to get to know the ropes.
Revision: 18927
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18927
Author: harkyman
Date: 2009-02-11 17:17:34 +0100 (Wed, 11 Feb 2009)
Log Message:
---
First operator done as a test and to get to know the ropes. Select Parent in
pose mode. Had to move the command to Shift-P, as naked P is taken up by some
crazy person's script command.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
Modified:
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
===
---
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
2009-02-11 14:56:35 UTC (rev 18926)
+++
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
2009-02-11 16:17:34 UTC (rev 18927)
@@ -49,6 +49,7 @@
void POSE_OT_loc_clear(struct wmOperatorType *ot);
void POSE_OT_scale_clear(struct wmOperatorType *ot);
void POSE_OT_de_select_all(struct wmOperatorType *ot);
+void POSE_OT_select_parent(struct wmOperatorType *ot);
#endif /* ED_ARMATURE_INTERN_H */
Modified:
branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
===
--- branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
2009-02-11 14:56:35 UTC (rev 18926)
+++ branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
2009-02-11 16:17:34 UTC (rev 18927)
@@ -129,6 +129,8 @@
WM_operatortype_append(POSE_OT_scale_clear);
WM_operatortype_append(POSE_OT_de_select_all);
+
+ WM_operatortype_append(POSE_OT_select_parent);
WM_operatortype_append(ARMATURE_OT_test); // XXX temp test for context
iterators... to be removed
}
@@ -172,5 +174,7 @@
WM_keymap_add_item(keymap, POSE_OT_scale_clear, SKEY, KM_PRESS,
KM_ALT, 0);
WM_keymap_add_item(keymap, POSE_OT_de_select_all, AKEY, KM_PRESS, 0,
0);
+
+ WM_keymap_add_item(keymap, POSE_OT_select_parent, PKEY, KM_PRESS,
KM_SHIFT, 0);
}
Modified:
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-02-11 14:56:35 UTC (rev 18926)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-02-11 16:17:34 UTC (rev 18927)
@@ -4421,6 +4421,43 @@
ot-flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
+
+static int pose_select_parent_exec(bContext *C, wmOperator *op)
+{
+ Object *ob= CTX_data_active_object(C);
+ bArmature *arm= ob-data;
+ bPoseChannel *pchan,*parent;
+
+ /* Determine if there is an active bone */
+ pchan=CTX_data_active_pchan(C);
+ if (pchan) {
+ parent=pchan-parent;
+ if ((parent) !(parent-bone-flag BONE_HIDDEN_P)) {
+ parent-bone-flag |= BONE_SELECTED;
+ parent-bone-flag |= BONE_ACTIVE;
+ pchan-bone-flag = ~BONE_ACTIVE;
+ }
+ }
+
+ WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, NULL);
+
+ return OPERATOR_FINISHED;
+}
+
+void POSE_OT_select_parent(wmOperatorType *ot)
+{
+ /* identifiers */
+ ot-name= select parent bone;
+ ot-idname= POSE_OT_select_parent;
+
+ /* api callbacks */
+ ot-exec= pose_select_parent_exec;
+ ot-poll= ED_operator_posemode;
+
+ /* flags */
+ ot-flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+}
/* * hide/unhide pose bones *** */
static int hide_selected_pose_bone(Object *ob, Bone *bone, void *ptr)
___
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 [18928] branches/blender2.5/blender/source /blender: 2.5
Revision: 18928
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18928
Author: ton
Date: 2009-02-11 17:54:55 +0100 (Wed, 11 Feb 2009)
Log Message:
---
2.5
Smaller jobs, all in one commit!
- Moved object_do_update out of view3d drawing, into
the event system (currently after notifiers).
Depsgraph calls for setting update flags will have to
keep track of each Screen's needs, so a UI showing only
a Sequencer doesn't do objects.
- Added button in Properties region in 3D window to set
or disable 4-split, including the 3 options it has.
(lock, box, clip)
- Restored legacy code for UI, to make things work like
bone rename, autocomplete.
- Node editor now shows Curves widgets again
- Bugfix: composite job increased Viewer user id count
- Bugfix: Node editor, not Enable nodes still called
a Job, which didn't do anything
- Various code cleaning, unused vars and prototypes.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
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_draw.c
branches/blender2.5/blender/source/blender/editors/interface/interface_intern.h
branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c
branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
branches/blender2.5/blender/source/blender/editors/space_node/space_node.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/makesdna/DNA_view3d_types.h
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
2009-02-11 16:17:34 UTC (rev 18927)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
2009-02-11 16:54:55 UTC (rev 18928)
@@ -1012,8 +1012,7 @@
oldsock-new_sock= sock;
}
- if(nnode-id)
- nnode-id-us++;
+ /* don't increase node-id users, freenode doesn't decrement either */
if(node-typeinfo-copystoragefunc)
node-typeinfo-copystoragefunc(node, nnode);
Modified:
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-02-11 16:17:34 UTC (rev 18927)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-02-11 16:54:55 UTC (rev 18928)
@@ -4386,7 +4386,6 @@
Object *ob= CTX_data_active_object(C);
bArmature *arm= ob-data;
bPoseChannel *pchan;
- EditBone *ebone;
int sel=1;
/* Determine if there are any selected bones
@@ -4425,7 +4424,6 @@
static int pose_select_parent_exec(bContext *C, wmOperator *op)
{
Object *ob= CTX_data_active_object(C);
- bArmature *arm= ob-data;
bPoseChannel *pchan,*parent;
/* Determine if there is an active bone */
@@ -4439,7 +4437,7 @@
}
}
- WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, NULL);
+ WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, ob);
return OPERATOR_FINISHED;
}
Modified:
branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
===
--- branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
2009-02-11 16:17:34 UTC (rev 18927)
+++ branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
2009-02-11 16:54:55 UTC (rev 18928)
@@ -513,6 +513,28 @@
void UI_add_area_handlers(struct ListBase *handlers);
void UI_add_popup_handlers(struct ListBase *handlers, uiPopupBlockHandle
*menu);
+/* Legacy code
+ * Callbacks and utils to get 2.48 work */
+
+void test_idbutton_cb(struct bContext *C, void *namev, void *arg2);
+void test_scriptpoin_but(struct bContext *C, char *name, ID
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18929] branches/blender2.5/blender/source /blender/editors/armature/editarmature.c: One last bit of personal education -- added OPERATOR_CANCELLED on
Revision: 18929
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18929
Author: harkyman
Date: 2009-02-11 18:46:10 +0100 (Wed, 11 Feb 2009)
Log Message:
---
One last bit of personal education -- added OPERATOR_CANCELLED on sanity check
failures.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
Modified:
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-02-11 16:54:55 UTC (rev 18928)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-02-11 17:46:10 UTC (rev 18929)
@@ -4435,7 +4435,13 @@
parent-bone-flag |= BONE_ACTIVE;
pchan-bone-flag = ~BONE_ACTIVE;
}
+ else {
+ return OPERATOR_CANCELLED;
+ }
}
+ else {
+ return OPERATOR_CANCELLED;
+ }
WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, ob);
___
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 [18930] branches/blender2.5/blender/source /blender: 2.5: Image window, some small changes:
Revision: 18930
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18930
Author: blendix
Date: 2009-02-11 20:16:14 +0100 (Wed, 11 Feb 2009)
Log Message:
---
2.5: Image window, some small changes:
* Added notifier for edited images.
* Fix main region emboss drawing when showing render.
* Don't go fullscreen with fileselect for now to work
around context getting lost, so open/replace works.
* Save operators are more complete now, but still lack
confirmation and choosing image type.
* Pack operators work correctly now (but not unpack).
* Setting white/black point for curves.
* Time cursor for record composite.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/space_image/image_draw.c
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/image_ops.c
branches/blender2.5/blender/source/blender/editors/space_image/space_image.c
branches/blender2.5/blender/source/blender/windowmanager/WM_types.h
Modified:
branches/blender2.5/blender/source/blender/editors/space_image/image_draw.c
===
--- branches/blender2.5/blender/source/blender/editors/space_image/image_draw.c
2009-02-11 17:46:10 UTC (rev 18929)
+++ branches/blender2.5/blender/source/blender/editors/space_image/image_draw.c
2009-02-11 19:16:14 UTC (rev 18930)
@@ -125,7 +125,7 @@
}
}
-static void sima_draw_render_info(SpaceImage *sima, ARegion *ar)
+static void draw_render_info(SpaceImage *sima, ARegion *ar)
{
rcti rect;
float colf[3];
@@ -136,23 +136,24 @@
return;
rect= ar-winrct;
- rect.ymin= rect.ymax - HEADER_HEIGHT;
+ rect.xmin= 0;
+ rect.ymin= ar-winrct.ymax - ar-winrct.ymin - HEADER_HEIGHT;
+ rect.xmax= ar-winrct.xmax - ar-winrct.xmin;
+ rect.ymax= ar-winrct.ymax - ar-winrct.ymin;
- glaDefine2DArea(rect);
-
/* clear header rect */
UI_GetThemeColor3fv(TH_BACK, colf);
- glClearColor(colf[0]+0.1f, colf[1]+0.1f, colf[2]+0.1f, 1.0);
- glClear(GL_COLOR_BUFFER_BIT);
+ glColor3f(colf[0]+0.1f, colf[1]+0.1f, colf[2]+0.1f);
+ glRecti(rect.xmin, rect.ymin, rect.xmax, rect.ymax);
UI_ThemeColor(TH_TEXT_HI);
- glRasterPos2i(12, 5);
- UI_RasterPos(12, 5);
+ glRasterPos2i(12, rect.ymin + 5);
+ UI_RasterPos(12, rect.ymin + 5);
if(showspare) {
UI_DrawString(G.fonts, (Previous), 0);
- glRasterPos2i(72, 5);
- UI_RasterPos(72, 5);
+ glRasterPos2i(72, rect.ymin + 5);
+ UI_RasterPos(72, rect.ymin + 5);
}
UI_DrawString(G.fonts, str, 0);
@@ -668,7 +669,7 @@
/* render info */
if(ibuf show_render)
- sima_draw_render_info(sima, ar);
+ draw_render_info(sima, ar);
/* XXX integrate this code */
#if 0
Modified:
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
===
---
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
2009-02-11 17:46:10 UTC (rev 18929)
+++
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
2009-02-11 19:16:14 UTC (rev 18930)
@@ -186,37 +186,6 @@
#ifndef DISABLE_PYTHON
if (event = 20) BPY_menu_do_python(PYMENU_IMAGE, event - 20);
#endif
- switch(event)
- {
- case 0:
- open_image_sima((G.qual==LR_CTRLKEY));
- break;
- case 1:
- replace_image_sima((G.qual==LR_CTRLKEY));
- break;
- case 2:
- pack_image_sima();
- break;
- case 5:
- save_as_image_sima();
- break;
- case 6:
- reload_image_sima();
- break;
- case 7:
- new_image_sima();
- break;
- case 8:
- save_image_sima();
- break;
- case 9:
- save_image_sequence_sima();
- break;
- case 10:
- BKE_image_memorypack(sima-image);
- allqueue(REDRAWIMAGE, 0);
- break;
- }
}
#endif
@@ -242,12 +211,14 @@
uiMenuItemO(head, 0, IMAGE_OT_open); // Open...
if(ima) {
- uiMenuItemO(head, 0, IMAGE_OT_replace); // Replace...
- uiMenuItemO(head, 0, IMAGE_OT_reload); // Reload...
+ if(!show_render) {
+ uiMenuItemO(head, 0, IMAGE_OT_replace); // Replace...
+ uiMenuItemO(head, 0, IMAGE_OT_reload); // Reload...
+ }
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18931] branches/blender2.5/blender/source /blender/editors: 2.5: Curve edit mode.
Revision: 18931
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18931
Author: blendix
Date: 2009-02-12 00:02:21 +0100 (Thu, 12 Feb 2009)
Log Message:
---
2.5: Curve edit mode. Transform works again, and editcurve.c is
partly operatorized though nothing hooked up yet.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h
branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c
branches/blender2.5/blender/source/blender/editors/curve/editcurve.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
branches/blender2.5/blender/source/blender/editors/screen/screen_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/curve/curve_intern.h
===
--- branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h
2009-02-11 19:16:14 UTC (rev 18930)
+++ branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h
2009-02-11 23:02:21 UTC (rev 18931)
@@ -38,5 +38,38 @@
/* editfont.c */
void FONT_OT_textedit(struct wmOperatorType *ot);
+/* editcurve.c */
+void CURVE_OT_separate(struct wmOperatorType *ot);
+void CURVE_OT_switch_direction(struct wmOperatorType *ot);
+void CURVE_OT_set_weight(struct wmOperatorType *ot);
+void CURVE_OT_set_radius(struct wmOperatorType *ot);
+void CURVE_OT_smooth(struct wmOperatorType *ot);
+void CURVE_OT_smooth_curve_radius(struct wmOperatorType *ot);
+void CURVE_OT_de_select_first(struct wmOperatorType *ot);
+void CURVE_OT_de_select_last(struct wmOperatorType *ot);
+void CURVE_OT_de_select_all(struct wmOperatorType *ot);
+void CURVE_OT_hide(struct wmOperatorType *ot);
+void CURVE_OT_reveal(struct wmOperatorType *ot);
+void CURVE_OT_select_invert(struct wmOperatorType *ot);
+void CURVE_OT_subdivide(struct wmOperatorType *ot);
+void CURVE_OT_set_spline_type(struct wmOperatorType *ot);
+void CURVE_OT_make_segment(struct wmOperatorType *ot);
+void CURVE_OT_spin(struct wmOperatorType *ot);
+void CURVE_OT_add_vertex(struct wmOperatorType *ot);
+void CURVE_OT_extrude(struct wmOperatorType *ot);
+void CURVE_OT_make_cyclic(struct wmOperatorType *ot);
+void CURVE_OT_select_linked(struct wmOperatorType *ot);
+void CURVE_OT_select_row(struct wmOperatorType *ot);
+void CURVE_OT_select_next(struct wmOperatorType *ot);
+void CURVE_OT_select_previous(struct wmOperatorType *ot);
+void CURVE_OT_select_more(struct wmOperatorType *ot);
+void CURVE_OT_select_less(struct wmOperatorType *ot);
+void CURVE_OT_select_random(struct wmOperatorType *ot);
+void CURVE_OT_select_every_nth(struct wmOperatorType *ot);
+void CURVE_OT_add_duplicate(struct wmOperatorType *ot);
+void CURVE_OT_delete(struct wmOperatorType *ot);
+void CURVE_OT_set_smooth(struct wmOperatorType *ot);
+void CURVE_OT_clear_tilt(struct wmOperatorType *ot);
+
#endif /* ED_UTIL_INTERN_H */
Modified: branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c
===
--- branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c
2009-02-11 19:16:14 UTC (rev 18930)
+++ branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c
2009-02-11 23:02:21 UTC (rev 18931)
@@ -64,6 +64,38 @@
void ED_operatortypes_curve(void)
{
WM_operatortype_append(FONT_OT_textedit);
+
+ WM_operatortype_append(CURVE_OT_separate);
+ WM_operatortype_append(CURVE_OT_switch_direction);
+ WM_operatortype_append(CURVE_OT_set_weight);
+ WM_operatortype_append(CURVE_OT_set_radius);
+ WM_operatortype_append(CURVE_OT_smooth);
+ WM_operatortype_append(CURVE_OT_smooth_curve_radius);
+ WM_operatortype_append(CURVE_OT_de_select_first);
+ WM_operatortype_append(CURVE_OT_de_select_last);
+ WM_operatortype_append(CURVE_OT_de_select_all);
+ WM_operatortype_append(CURVE_OT_hide);
+ WM_operatortype_append(CURVE_OT_reveal);
+ WM_operatortype_append(CURVE_OT_select_invert);
+ WM_operatortype_append(CURVE_OT_subdivide);
+ WM_operatortype_append(CURVE_OT_set_spline_type);
+ WM_operatortype_append(CURVE_OT_make_segment);
+ WM_operatortype_append(CURVE_OT_spin);
+ WM_operatortype_append(CURVE_OT_add_vertex);
+ WM_operatortype_append(CURVE_OT_extrude);
+ WM_operatortype_append(CURVE_OT_make_cyclic);
+ WM_operatortype_append(CURVE_OT_select_linked);
+ WM_operatortype_append(CURVE_OT_select_row);
+ WM_operatortype_append(CURVE_OT_select_next);
+ WM_operatortype_append(CURVE_OT_select_previous);
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18932] branches/blender2.5/blender/source /blender/editors/armature: 2.5
Revision: 18932
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18932
Author: mfoxdogg
Date: 2009-02-12 00:50:06 +0100 (Thu, 12 Feb 2009)
Log Message:
---
2.5
**
ported selection_invert for both edit armature and pose mode
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
Modified:
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
===
---
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
2009-02-11 23:02:21 UTC (rev 18931)
+++
branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h
2009-02-11 23:50:06 UTC (rev 18932)
@@ -42,6 +42,7 @@
void ARMATURE_OT_parent_set(struct wmOperatorType *ot);
void ARMATURE_OT_parent_clear(struct wmOperatorType *ot);
void ARMATURE_OT_de_select_all(struct wmOperatorType *ot);
+void ARMATURE_OT_selection_invert(struct wmOperatorType *ot);
void POSE_OT_hide(struct wmOperatorType *ot);
void POSE_OT_reveil(struct wmOperatorType *ot);
@@ -49,6 +50,7 @@
void POSE_OT_loc_clear(struct wmOperatorType *ot);
void POSE_OT_scale_clear(struct wmOperatorType *ot);
void POSE_OT_de_select_all(struct wmOperatorType *ot);
+void POSE_OT_selection_invert(struct wmOperatorType *ot);
void POSE_OT_select_parent(struct wmOperatorType *ot);
#endif /* ED_ARMATURE_INTERN_H */
Modified:
branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
===
--- branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
2009-02-11 23:02:21 UTC (rev 18931)
+++ branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
2009-02-11 23:50:06 UTC (rev 18932)
@@ -119,6 +119,7 @@
WM_operatortype_append(ARMATURE_OT_parent_clear);
WM_operatortype_append(ARMATURE_OT_de_select_all);
+ WM_operatortype_append(ARMATURE_OT_selection_invert);
/* POSE */
WM_operatortype_append(POSE_OT_hide);
@@ -129,6 +130,7 @@
WM_operatortype_append(POSE_OT_scale_clear);
WM_operatortype_append(POSE_OT_de_select_all);
+ WM_operatortype_append(POSE_OT_selection_invert);
WM_operatortype_append(POSE_OT_select_parent);
@@ -157,6 +159,7 @@
WM_keymap_add_item(keymap, ARMATURE_OT_clear_parent, PKEY, KM_PRESS,
KM_ALT, 0);
WM_keymap_add_item(keymap, ARMATURE_OT_de_select_all, AKEY, KM_PRESS,
0, 0);
+ WM_keymap_add_item(keymap, ARMATURE_OT_selection_invert, IKEY,
KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, ARMATURE_OT_test, TKEY, KM_PRESS, 0, 0);
// XXX temp test for context iterators... to be removed
@@ -174,6 +177,7 @@
WM_keymap_add_item(keymap, POSE_OT_scale_clear, SKEY, KM_PRESS,
KM_ALT, 0);
WM_keymap_add_item(keymap, POSE_OT_de_select_all, AKEY, KM_PRESS, 0,
0);
+ WM_keymap_add_item(keymap, POSE_OT_selection_invert, IKEY, KM_PRESS,
KM_CTRL, 0);
WM_keymap_add_item(keymap, POSE_OT_select_parent, PKEY, KM_PRESS,
KM_SHIFT, 0);
}
Modified:
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-02-11 23:02:21 UTC (rev 18931)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-02-11 23:50:06 UTC (rev 18932)
@@ -3509,8 +3509,45 @@
RNA_def_enum(ot-srna, type, prop_editarm_clear_parent_types, 0,
ClearType, What way to clear parenting);
}
-/* ** (de)select All ***/
+/* Selections **/
+
+static int armature_selection_invert_exec(bContext *C, wmOperator *op)
+{
+ Object *obedit = CTX_data_edit_object(C);
+ bArmature *arm= obedit-data;
+ EditBone *ebone;
+
+ /* Set the flags */
+ for (ebone=arm-edbo-first;ebone;ebone=ebone-next) {
+ /* select bone */
+ if(arm-layer ebone-layer (ebone-flag
BONE_HIDDEN_A)==0) {
+ ebone-flag ^= (BONE_SELECTED | BONE_TIPSEL |
BONE_ROOTSEL);
+ ebone-flag = ~BONE_ACTIVE;
+ }
+ }
+
+ /* undo? */
+ WM_event_add_notifier(C, NC_OBJECT|ND_BONE_SELECT, NULL);
+
+ return OPERATOR_FINISHED;
+}
+
+void ARMATURE_OT_selection_invert(wmOperatorType *ot)
+{
+
+ /* identifiers */
+ ot-name= Invert Selection;
+ ot-idname= ARMATURE_OT_selection_invert;
+
+ /* api callbacks */
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18934] trunk/blender/release/scripts/ export_fbx.py: According to Amir Ebrahimi, fbx vertex color is supposed to be between 0.0 and 1.0 rather then 0
Revision: 18934
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18934
Author: campbellbarton
Date: 2009-02-12 02:46:38 +0100 (Thu, 12 Feb 2009)
Log Message:
---
According to Amir Ebrahimi, fbx vertex color is supposed to be between 0.0 and
1.0 rather then 0-255
At the moment I dont have a way to test this.
Modified Paths:
--
trunk/blender/release/scripts/export_fbx.py
Modified: trunk/blender/release/scripts/export_fbx.py
===
--- trunk/blender/release/scripts/export_fbx.py 2009-02-12 01:11:29 UTC (rev
18933)
+++ trunk/blender/release/scripts/export_fbx.py 2009-02-12 01:46:38 UTC (rev
18934)
@@ -1446,13 +1446,13 @@
for f in me.faces:
for col in f.col:
if i==-1:
-
file.write('%i,%i,%i,255' % (col[0], col[1], col[2]))
+
file.write('%.4f,%.4f,%.4f,1' % (col[0]/255.0, col[1]/255.0, col[2]/255.0))
i=0
else:
if i==7:
file.write('\n\t\t\t\t')
i=0
-
file.write(',%i,%i,%i,255' % (col[0], col[1], col[2]))
+
file.write(',%.4f,%.4f,%.4f,1' % (col[0]/255.0, col[1]/255.0, col[2]/255.0))
i+=1
ii+=1 # One more Color
___
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 [18935] branches/blender2.5/blender/source /blender/editors/space_graph/graph_draw.c: Graph Editor: Experimental variations of curve display
Revision: 18935
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18935
Author: aligorith
Date: 2009-02-12 02:47:45 +0100 (Thu, 12 Feb 2009)
Log Message:
---
Graph Editor: Experimental variations of curve display
* Uneditable F-Curves are drawn with dotted lines (and no handles)
* Muted F-Curves are drawn with a greyish colour. I'm not sure how visible this
will be under some other colour schemes. Perhaps this needs as separate theme
colour?
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
===
--- branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
2009-02-12 01:46:38 UTC (rev 18934)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
2009-02-12 01:47:45 UTC (rev 18935)
@@ -707,11 +707,29 @@
/* draw curve - we currently calculate colour on the fly, but
that should probably be done in advance instead */
if ( ((fcu-bezt) || (fcu-fpt)) (fcu-totvert) ) {
- col= ipo_rainbow(i, items);
- cpack(col);
+ /* set color/drawing style for curve itself */
+ if (fcu-flag FCURVE_PROTECTED) {
+ /* protected curves (non editable) are drawn
with dotted lines */
+ setlinestyle(2);
+ }
+ if (fcu-flag FCURVE_MUTED) {
+ /* muted curves are drawn in a greyish hue */
+ // XXX should we have some variations?
+ UI_ThemeColorShade(TH_HEADER, 50);
+ }
+ else {
+ // XXX color calculation here really needs to
be done in advance instead
+ col= ipo_rainbow(i, items);
+ cpack(col);
+ }
+ /* draw F-Curve */
draw_fcurve_repeat(fcu, ar-v2d, 0, 0, fac); // XXX
this call still needs a lot more work
+ /* restore settings */
+ setlinestyle(0);
+
+
/* draw handles and vertices as appropriate */
if (fcu-bezt) {
/* only draw handles/vertices on keyframes */
___
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 [18936] branches/blender2.5/blender/source /blender: * Added description string to operator types, should be set along with ot-idname when defining o
Revision: 18936
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18936
Author: campbellbarton
Date: 2009-02-12 04:39:56 +0100 (Thu, 12 Feb 2009)
Log Message:
---
* Added description string to operator types, should be set along with
ot-idname when defining ops.
* User interface uses this as a tooltip when NULL or is given.
* Python doc generation includes this description
* Python defined ops take the description as an argument.
* NULL check to image_ops.c, was crashing on exit when there was an image open.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/interface/interface.c
branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/blender2.5/blender/source/blender/python/epy_doc_gen.py
branches/blender2.5/blender/source/blender/python/intern/bpy_opwrapper.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.c
===
--- branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-02-12 01:47:45 UTC (rev 18935)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-02-12 03:39:56 UTC (rev 18936)
@@ -2308,6 +2308,10 @@
if(ot) str= ot-name;
else str= opname;
}
+
+ if ((!tip || tip[0]=='\0') ot-description) {
+ tip= ot-description;
+ }
but= ui_def_but(block, type, -1, str, x1, y1, x2, y2, NULL, 0, 0, 0, 0,
tip);
but-opname= opname;
Modified:
branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c
===
--- branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c
2009-02-12 01:47:45 UTC (rev 18935)
+++ branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c
2009-02-12 03:39:56 UTC (rev 18936)
@@ -1221,6 +1221,9 @@
ImBuf *ibuf= ED_space_image_buffer(sima);
ImageSampleInfo *info= arg_info;
+ if(ibuf == NULL)
+ return;
+
draw_image_info(ar, ibuf-channels, info-x, info-y, info-colp,
info-colfp, info-zp, info-zfp);
}
Modified:
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
===
---
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
2009-02-12 01:47:45 UTC (rev 18935)
+++
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
2009-02-12 03:39:56 UTC (rev 18936)
@@ -213,6 +213,7 @@
/* identifiers */
ot-name= Add Scene Strip;
ot-idname= SEQUENCER_OT_add_scene_strip;
+ ot-description= Add a strip to the sequencer using a blender scene as
a source;
/* api callbacks */
ot-invoke= sequencer_add_scene_strip_invoke;
@@ -300,6 +301,7 @@
/* identifiers */
ot-name= Add Movie Strip;
ot-idname= SEQUENCER_OT_add_movie_strip;
+ ot-description= Add a movie strip to the sequencer;
/* api callbacks */
ot-invoke= sequencer_add_movie_strip_invoke;
@@ -400,6 +402,7 @@
/* identifiers */
ot-name= Add Sound Strip;
ot-idname= SEQUENCER_OT_add_sound_strip;
+ ot-description= Add a sound strip to the sequencer;
/* api callbacks */
ot-invoke= sequencer_add_sound_strip_invoke;
@@ -492,6 +495,7 @@
/* identifiers */
ot-name= Add Image Strip;
ot-idname= SEQUENCER_OT_add_image_strip;
+ ot-description= Add an image or image sequence to the sequencer;
/* api callbacks */
ot-invoke= sequencer_add_image_strip_invoke;
@@ -623,6 +627,7 @@
/* identifiers */
ot-name= Add Effect Strip;
ot-idname= SEQUENCER_OT_add_effect_strip;
+ ot-description= Add an effect to the sequencer, most are applied
ontop of existing strips;
/* api callbacks */
ot-invoke= sequencer_add_effect_strip_invoke;
Modified:
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
===
---
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
2009-02-12 01:47:45 UTC (rev 18935)
+++
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
2009-02-12 03:39:56 UTC (rev 18936)
@@ -123,7 +123,8 @@
struct wmOperatorType *next, *prev;
char *name; /* text for ui, undo */
- char *idname; /*
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18938] branches/blender2.5/blender/source /blender/blenfont/intern: Commit to continue tomorrow from work.
Revision: 18938
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18938
Author: bdiego
Date: 2009-02-12 06:02:42 +0100 (Thu, 12 Feb 2009)
Log Message:
---
Commit to continue tomorrow from work.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c
branches/blender2.5/blender/source/blender/blenfont/intern/blf_internal_types.h
Added Paths:
---
branches/blender2.5/blender/source/blender/blenfont/intern/blf.c
Added: branches/blender2.5/blender/source/blender/blenfont/intern/blf.c
===
--- branches/blender2.5/blender/source/blender/blenfont/intern/blf.c
(rev 0)
+++ branches/blender2.5/blender/source/blender/blenfont/intern/blf.c
2009-02-12 05:02:42 UTC (rev 18938)
@@ -0,0 +1,208 @@
+/**
+ * $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
+ *
+ * * END GPL LICENSE BLOCK *
+ */
+
+#if 0
+
+#include stdio.h
+#include stdlib.h
+#include string.h
+
+#include ft2build.h
+
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+
+#include MEM_guardedalloc.h
+
+#include DNA_listBase.h
+
+#include BKE_utildefines.h
+
+#include BLI_blenlib.h
+#include BLI_linklist.h /* linknode */
+#include BLI_string.h
+
+#include blf_internal_types.h
+#include blf_internal.h
+
+
+/* Max number of font in memory.
+ * Take care that now every font have a glyph cache per size/dpi,
+ * so we don't need load the same font with different size, just
+ * load one and call BLF_size.
+ */
+#define BLF_MAX_FONT 16
+
+/* Font array. */
+FontBLF *global_font[BLF_MAX_FONT];
+
+/* Number of font. */
+int global_font_num= 0;
+
+/* Current font. */
+int global_font_cur= 0;
+
+int BLF_init(void)
+{
+ int i;
+
+ for (i= 0; i BLF_MAX_FONT; i++)
+ global_font[i]= NULL;
+
+ return(blf_font_init());
+}
+
+int blf_search(char *name)
+{
+ FontBLF *font;
+ int i;
+
+ for (i= 0; i global_font_num; i++) {
+ font= global_font[i];
+ if (font (!strcmp(font-name, name)))
+ return(i);
+ }
+ return(-1);
+}
+
+int BLF_load(char *name)
+{
+ FontBLF *font;
+ char *filename;
+ int i;
+
+ if (!name)
+ return(-1);
+
+ /* check if we already load this font. */
+ i= blf_search(name);
+ if (i = 0)
+ return(i);
+
+ if (global_font_num+1 = BLF_MAX_FONT)
+ return(-1);
+
+ filename= blf_dir_search(name);
+ if (!filename)
+ return(-1);
+
+ font= blf_font_new(name, filename);
+ MEM_freeN(filename);
+
+ if (!font)
+ return(-1);
+
+ global_font[global_font_num]= font;
+ i= global_font_num;
+ global_font_num++;
+ return(i);
+}
+
+int BLF_load_mem(char *name, unsigned char *mem, int mem_size)
+{
+ FontBLF *font;
+ int i;
+
+ if (!name || !mem || !mem_size)
+ return(-1);
+
+ i= blf_search(name);
+ if (i = 0)
+ return(i);
+
+ if (global_font_num+1 = BLF_MAX_FONT)
+ return(-1);
+
+ font= blf_font_new_from_mem(name, mem, size);
+ if (!font)
+ return(-1);
+
+ global_font[global_font_num]= font;
+ i= global_font_num;
+ global_font_num++;
+ return(i);
+}
+
+void BLF_set(int fontid)
+{
+ if (fontid = 0 fontid global_font_num)
+ global_font_cur= fontid;
+}
+
+void BLF_aspect(float aspect)
+{
+ FontBLF *font;
+
+ font= global_font[global_font_cur];
+ if (font)
+ font-aspect= aspect;
+}
+
+void BLF_position(float x, float y, float z)
+{
+ FontBLF *font;
+
+ font= global_font[global_font_cur];
+ if (font) {
+ font-pos[0]= x;
+ font-pos[1]= y;
+ font-pos[2]= z;
+ }
+}
+
+void BLF_size(int size, int dpi)
+{
+ FontBLF *font;
+
+ font= global_font[global_font_cur];
+ if
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18939] branches/blender2.5/blender/source /blender/makesdna/DNA_windowmanager_types.h: own error in last commit.
Revision: 18939
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18939
Author: campbellbarton
Date: 2009-02-12 07:36:06 +0100 (Thu, 12 Feb 2009)
Log Message:
---
own error in last commit.
Modified Paths:
--
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
Modified:
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
===
---
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
2009-02-12 05:02:42 UTC (rev 18938)
+++
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h
2009-02-12 06:36:06 UTC (rev 18939)
@@ -117,8 +117,8 @@
ListBase gesture; /* gesture stuff */
} wmWindow;
-#
-#
+
+
typedef struct wmOperatorType {
struct wmOperatorType *next, *prev;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
