[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18918] branches/blender2.5/blender/source /blender: 2.5: Image window operators, quite a few of these still have
Brecht Van Lommel
brecht at blender.org
Wed Feb 11 00:17:58 CET 2009
Revision: 18918
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18918
Author: blendix
Date: 2009-02-11 00:17:58 +0100 (Wed, 11 Feb 2009)
Log Message:
-----------
2.5: Image window operators, quite a few of these still have
missing parts and are work in progress.
Set 3D Cursor
Set Tile
Sample Color
New
Open
Replace
Reload
Save (As)
Save Sequence
Pack
Unpack
Record Composite
The file select operators have context issues still. They need
to get the image space in the context on exec() but it's not
there currently, not sure how to solve that yet.
Also added name parameter to uiMenuItemEnumO, and fixed "mute"
argument in ED_update_for_newframe calls in fluidsim bake.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/include/ED_image.h
branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.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_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/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/transform/transform_orientations.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
Modified: branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-02-10 23:08:53 UTC (rev 18917)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-02-10 23:17:58 UTC (rev 18918)
@@ -3429,11 +3429,11 @@
}
CTX_DATA_END;
- uiMenuItemEnumO(head, 0, "ARMATURE_OT_set_parent", "type", ARM_PAR_CONNECT);
+ uiMenuItemEnumO(head, "", 0, "ARMATURE_OT_set_parent", "type", ARM_PAR_CONNECT);
/* ob becomes parent, make the associated menus */
if (allchildbones)
- uiMenuItemEnumO(head, 0, "ARMATURE_OT_set_parent", "type", ARM_PAR_OFFSET);
+ uiMenuItemEnumO(head, "", 0, "ARMATURE_OT_set_parent", "type", ARM_PAR_OFFSET);
uiPupMenuEnd(C, head);
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_image.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_image.h 2009-02-10 23:08:53 UTC (rev 18917)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_image.h 2009-02-10 23:17:58 UTC (rev 18918)
@@ -33,7 +33,7 @@
/* space_image.c, exported for transform */
struct Image *ED_space_image(struct SpaceImage *sima);
-void ED_space_image_set(struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima);
+void ED_space_image_set(struct bContext *C, struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima);
struct ImBuf *ED_space_image_buffer(struct SpaceImage *sima);
void ED_space_image_size(struct SpaceImage *sima, int *width, int *height);
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-10 23:08:53 UTC (rev 18917)
+++ branches/blender2.5/blender/source/blender/editors/include/UI_interface.h 2009-02-10 23:17:58 UTC (rev 18918)
@@ -212,7 +212,7 @@
void uiMenuItemVal(uiMenuItem *head, const char *name, int icon, int argval);
-void uiMenuItemEnumO(uiMenuItem *head, int icon, char *opname, char *propname, int value);
+void uiMenuItemEnumO(uiMenuItem *head, const char *name, int icon, char *opname, char *propname, int value);
void uiMenuItemBooleanO(uiMenuItem *head, const char *name, int icon, char *opname, char *propname, int value);
void uiMenuItemsEnumO(uiMenuItem *head, char *opname, char *propname);
void uiMenuItemIntO(uiMenuItem *head, const char *name, int icon, char *opname, char *propname, int value);
Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c 2009-02-10 23:08:53 UTC (rev 18917)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c 2009-02-10 23:17:58 UTC (rev 18918)
@@ -2009,9 +2009,9 @@
}
/* single operator item with property */
-void uiMenuItemEnumO(uiMenuItem *head, int icon, char *opname, char *propname, int value)
+void uiMenuItemEnumO(uiMenuItem *head, const char *name, int icon, char *opname, char *propname, int value)
{
- uiMenuItem *item= ui_menu_add_item(head, "", icon, 0);
+ uiMenuItem *item= ui_menu_add_item(head, name, icon, 0);
item->opname= opname; // static!
item->propname= propname; // static!
@@ -2072,7 +2072,7 @@
RNA_property_enum_items(&ptr, prop, &item, &totitem);
for (i=0; i<totitem; i++)
- uiMenuItemEnumO(head, 0, opname, propname, item[i].value);
+ uiMenuItemEnumO(head, "", 0, opname, propname, item[i].value);
}
}
@@ -2136,8 +2136,6 @@
item->opname= opname; // static!
item->propname= propname; // static!
-
- BLI_addtail(&head->items, item);
}
/* make a new level from enum properties */
@@ -2153,8 +2151,6 @@
item->rnapoin= *ptr;
item->propname= propname; // static!
-
- BLI_addtail(&head->items, item);
}
/* separator */
Modified: branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c 2009-02-10 23:08:53 UTC (rev 18917)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c 2009-02-10 23:17:58 UTC (rev 18918)
@@ -526,13 +526,13 @@
uiMenuLevelEnumO(head, "OBJECT_OT_mesh_add", "type");
uiMenuLevelEnumO(head, "OBJECT_OT_curve_add", "type");
- uiMenuItemEnumO(head, 0, "OBJECT_OT_object_add", "type", OB_SURF);
- uiMenuItemEnumO(head, 0, "OBJECT_OT_object_add", "type", OB_MBALL);
- uiMenuItemEnumO(head, 0, "OBJECT_OT_object_add", "type", OB_CAMERA);
- uiMenuItemEnumO(head, 0, "OBJECT_OT_object_add", "type", OB_LAMP);
- uiMenuItemEnumO(head, 0, "OBJECT_OT_object_add", "type", OB_EMPTY);
- uiMenuItemEnumO(head, 0, "OBJECT_OT_armature_add", "type", OB_ARMATURE);
- uiMenuItemEnumO(head, 0, "OBJECT_OT_object_add", "type", OB_LATTICE);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_object_add", "type", OB_SURF);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_object_add", "type", OB_MBALL);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_object_add", "type", OB_CAMERA);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_object_add", "type", OB_LAMP);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_object_add", "type", OB_EMPTY);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_armature_add", "type", OB_ARMATURE);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_object_add", "type", OB_LATTICE);
uiPupMenuEnd(C, head);
@@ -2448,20 +2448,20 @@
uiMenuItem *head= uiPupMenuBegin("Make Parent To", 0);
uiMenuContext(head, WM_OP_EXEC_DEFAULT);
- uiMenuItemEnumO(head, 0, "OBJECT_OT_make_parent", "type", PAR_OBJECT);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_OBJECT);
/* ob becomes parent, make the associated menus */
if(ob->type==OB_ARMATURE) {
- uiMenuItemEnumO(head, 0, "OBJECT_OT_make_parent", "type", PAR_ARMATURE);
- uiMenuItemEnumO(head, 0, "OBJECT_OT_make_parent", "type", PAR_BONE);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_ARMATURE);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_BONE);
}
else if(ob->type==OB_CURVE) {
- uiMenuItemEnumO(head, 0, "OBJECT_OT_make_parent", "type", PAR_CURVE);
- uiMenuItemEnumO(head, 0, "OBJECT_OT_make_parent", "type", PAR_FOLLOW);
- uiMenuItemEnumO(head, 0, "OBJECT_OT_make_parent", "type", PAR_PATH_CONST);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_CURVE);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_FOLLOW);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_PATH_CONST);
}
else if(ob->type == OB_LATTICE) {
- uiMenuItemEnumO(head, 0, "OBJECT_OT_make_parent", "type", PAR_LATTICE);
+ uiMenuItemEnumO(head, "", 0, "OBJECT_OT_make_parent", "type", PAR_LATTICE);
}
uiPupMenuEnd(C, head);
Modified: branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c 2009-02-10 23:08:53 UTC (rev 18917)
+++ branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c 2009-02-10 23:17:58 UTC (rev 18918)
@@ -262,7 +262,7 @@
float *verts=NULL;
int *tris=NULL;
scene->r.cfra = frame;
- ED_update_for_newframe(C, 0);
+ ED_update_for_newframe(C, 1);
initElbeemMesh(scene, obm, &numVerts, &verts, &numTris, &tris, 1, modifierIndex);
//fprintf(stderr,"\nfluidsimInitMeshChannel frame%d verts%d/%d \n\n",frame,vertices,numVerts);
@@ -596,7 +596,7 @@
// CHECK more reasonable to number frames according to blender?
// dump data for frame 0
scene->r.cfra = startFrame;
- ED_update_for_newframe(C, 0);
+ ED_update_for_newframe(C, 1);
// init common export vars for both file export and run
for(i=0; i<256; i++) {
@@ -985,7 +985,7 @@
fsmesh.channelSizeVertices = allchannelSize;
fluidsimInitMeshChannel(C, &fsmesh.channelVertices, allchannelSize, obit, numVerts, timeAtFrame, modifierIndex);
scene->r.cfra = startFrame;
- ED_update_for_newframe(C, 0);
+ ED_update_for_newframe(C, 1);
// remove channels
fsmesh.channelTranslation =
fsmesh.channelRotation =
@@ -1063,7 +1063,7 @@
ScrArea *sa;
scene->r.cfra = startFrame+globalBakeFrame;
lastRedraw = globalBakeFrame;
- ED_update_for_newframe(C, 0);
+ ED_update_for_newframe(C, 1);
sa= G.curscreen->areabase.first;
while(sa) {
if(sa->spacetype == SPACE_VIEW3D) { scrarea_do_windraw(sa); }
@@ -1096,7 +1096,7 @@
}
scene->r.cfra = origFrame;
- ED_update_for_newframe(C, 0);
+ ED_update_for_newframe(C, 1);
if(!simAborted) {
char fsmessage[512];
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-10 23:08:53 UTC (rev 18917)
+++ branches/blender2.5/blender/source/blender/editors/space_image/image_draw.c 2009-02-10 23:17:58 UTC (rev 18918)
@@ -158,10 +158,12 @@
UI_DrawString(G.fonts, str, 0);
}
-/*static void sima_draw_image_info(ARegion *ar, int channels, int x, int y, char *cp, float *fp, int *zp, float *zpf)
+void draw_image_info(ARegion *ar, int channels, int x, int y, char *cp, float *fp, int *zp, float *zpf)
{
char str[256];
int ofs;
+
+ ED_region_pixelspace(ar);
ofs= sprintf(str, "X: %d Y: %d ", x, y);
if(cp)
@@ -193,7 +195,7 @@
UI_RasterPos(10, 10);
UI_DrawString(G.fonts, str, 0);
-}*/
+}
/* image drawing */
@@ -493,36 +495,6 @@
/* draw uv edit */
-/* XXX this becomes draw extra? */
-#if 0
- glPixelZoom(zoomx, zoomy);
-
- if(sima->flag & SI_EDITTILE) {
- /* create char buffer from float if needed */
- image_verify_buffer_float(sima, ibuf);
-
- glaDrawPixelsSafe(x1, y1, ibuf->x, ibuf->y, ibuf->x, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
-
- glPixelZoom(1.0, 1.0);
-
- dx= ibuf->x/sima->image->xrep;
- dy= ibuf->y/sima->image->yrep;
- sy= (sima->curtile / sima->image->xrep);
- sx= sima->curtile - sy*sima->image->xrep;
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list