Revision: 49415
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49415
Author: campbellbarton
Date: 2012-07-31 14:16:27 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
resolve glitch in the image space where mask editing and UVs would conflict.
now UV editing overrides mask.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_image.py
trunk/blender/source/blender/blenkernel/BKE_mesh.h
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/editors/include/ED_image.h
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_image/image_edit.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_image.py 2012-07-31
14:01:28 UTC (rev 49414)
+++ trunk/blender/release/scripts/startup/bl_ui/space_image.py 2012-07-31
14:16:27 UTC (rev 49415)
@@ -380,6 +380,8 @@
if not show_render:
layout.prop(sima, "use_image_pin", text="")
+ layout.prop(sima, "mode", text="")
+
# uv editing
if show_uvedit:
uvedit = sima.uv_editor
@@ -405,9 +407,7 @@
mesh = context.edit_object.data
layout.prop_search(mesh.uv_textures, "active", mesh,
"uv_textures", text="")
- layout.prop(sima, "mode", text="")
-
- if mode == 'MASK':
+ elif mode == 'MASK':
row = layout.row()
row.template_ID(sima, "mask", new="mask.new")
Modified: trunk/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mesh.h 2012-07-31 14:01:28 UTC
(rev 49414)
+++ trunk/blender/source/blender/blenkernel/BKE_mesh.h 2012-07-31 14:16:27 UTC
(rev 49415)
@@ -161,8 +161,8 @@
struct CustomData *fdata, struct
CustomData *ldata, struct CustomData *pdata,
int totedge_i, int totface_i, int
totloop_i, int totpoly_i,
struct MEdge *medge, struct MFace
*mface,
-
int *totloop_r, int *totpoly_r,
-
struct MLoop **mloop_r, struct MPoly **mpoly_r);
+ int *totloop_r, int *totpoly_r,
+ struct MLoop **mloop_r, struct MPoly
**mpoly_r);
void BKE_mesh_calc_normals_tessface(struct MVert *mverts, int numVerts, struct
MFace *mfaces, int numFaces, float (*faceNors_r)[3]);
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-07-31 14:01:28 UTC (rev 49414)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-07-31 14:16:27 UTC (rev 49415)
@@ -1754,7 +1754,6 @@
DerivedMesh *CDDM_from_curve_displist(Object *ob, ListBase *dispbase, int
**orco_index_ptr)
{
- const short do_orco_as_uv= 1;
DerivedMesh *dm;
CDDerivedMesh *cddm;
MVert *allvert;
@@ -1787,10 +1786,6 @@
CDDM_calc_edges(dm);
- if (do_orco_as_uv ) {
- BKE_curve_make_orco(NULL, ob);
- }
-
return dm;
}
Modified: trunk/blender/source/blender/editors/include/ED_image.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_image.h 2012-07-31
14:01:28 UTC (rev 49414)
+++ trunk/blender/source/blender/editors/include/ED_image.h 2012-07-31
14:16:27 UTC (rev 49415)
@@ -71,7 +71,7 @@
int ED_space_image_show_uvedit(struct SpaceImage *sima, struct Object *obedit);
int ED_space_image_show_uvshadow(struct SpaceImage *sima, struct Object
*obedit);
-int ED_space_image_check_show_maskedit(struct SpaceImage *sima);
+int ED_space_image_check_show_maskedit(struct Scene *scene, struct SpaceImage
*sima);
int ED_space_image_maskedit_poll(struct bContext *C);
int ED_space_image_maskedit_mask_poll(struct bContext *C);
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2012-07-31
14:01:28 UTC (rev 49414)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2012-07-31
14:16:27 UTC (rev 49415)
@@ -476,7 +476,8 @@
case SPACE_IMAGE:
{
SpaceImage *sima = sa->spacedata.first;
- return ED_space_image_check_show_maskedit(sima);
+ Scene *scene = CTX_data_scene(C);
+ return
ED_space_image_check_show_maskedit(scene, sima);
}
}
}
Modified: trunk/blender/source/blender/editors/space_image/image_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_edit.c
2012-07-31 14:01:28 UTC (rev 49414)
+++ trunk/blender/source/blender/editors/space_image/image_edit.c
2012-07-31 14:16:27 UTC (rev 49415)
@@ -352,8 +352,14 @@
}
/* matches clip function */
-int ED_space_image_check_show_maskedit(SpaceImage *sima)
+int ED_space_image_check_show_maskedit(Scene *scene, SpaceImage *sima)
{
+ /* check editmode - this is reserved for UV editing */
+ Object *ob = OBACT;
+ if (ob && ob->mode & OB_MODE_EDIT) {
+ return FALSE;
+ }
+
return (sima->mode == SI_MODE_MASK);
}
@@ -362,7 +368,8 @@
SpaceImage *sima = CTX_wm_space_image(C);
if (sima && sima->image) {
- return ED_space_image_check_show_maskedit(sima);
+ Scene *scene = CTX_data_scene(C);
+ return ED_space_image_check_show_maskedit(scene, sima);
}
return FALSE;
Modified: trunk/blender/source/blender/makesrna/intern/rna_object_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_api.c
2012-07-31 14:01:28 UTC (rev 49414)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_api.c
2012-07-31 14:16:27 UTC (rev 49415)
@@ -126,7 +126,7 @@
}
/* convert object type to mesh */
- BKE_mesh_from_nurbs_displist(tmpobj, &dispbase,
uv_from_orco ? &orco_index : NULL);
+ BKE_mesh_from_nurbs_displist(tmpobj, &dispbase,
uv_from_orco ? (int **)&orco_index : NULL);
tmpmesh = tmpobj->data;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
