[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33800] trunk/blender/source/blender/ editors: bugfix [#25238] Render image window edits UV's
Campbell Barton
ideasman42 at gmail.com
Mon Dec 20 06:26:27 CET 2010
Revision: 33800
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33800
Author: campbellbarton
Date: 2010-12-20 06:26:25 +0100 (Mon, 20 Dec 2010)
Log Message:
-----------
bugfix [#25238] Render image window edits UV's
Modified Paths:
--------------
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2010-12-20 03:59:22 UTC (rev 33799)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2010-12-20 05:26:25 UTC (rev 33800)
@@ -54,6 +54,7 @@
#include "WM_types.h"
#include "ED_util.h"
+#include "ED_image.h"
#include "ED_screen.h"
#include "ED_object.h"
#include "ED_armature.h"
@@ -320,23 +321,12 @@
return 0;
}
-
+/* wrapper for ED_space_image_show_uvedit */
int ED_operator_uvedit(bContext *C)
{
+ SpaceImage *sima= CTX_wm_space_image(C);
Object *obedit= CTX_data_edit_object(C);
- EditMesh *em= NULL;
-
- if(obedit && obedit->type==OB_MESH)
- em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
-
- if(em && (em->faces.first) && (CustomData_has_layer(&em->fdata, CD_MTFACE))) {
- BKE_mesh_end_editmesh(obedit->data, em);
- return 1;
- }
-
- if(obedit)
- BKE_mesh_end_editmesh(obedit->data, em);
- return 0;
+ return ED_space_image_show_uvedit(sima, obedit);
}
int ED_operator_uvmap(bContext *C)
Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c 2010-12-20 03:59:22 UTC (rev 33799)
+++ trunk/blender/source/blender/editors/space_image/space_image.c 2010-12-20 05:26:25 UTC (rev 33800)
@@ -265,11 +265,9 @@
int ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit)
{
- if(ED_space_image_show_render(sima))
+ if(sima && (ED_space_image_show_render(sima) || ED_space_image_show_paint(sima)))
return 0;
- if(ED_space_image_show_paint(sima))
- return 0;
-
+
if(obedit && obedit->type == OB_MESH) {
EditMesh *em = BKE_mesh_get_editmesh(obedit->data);
int ret;
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2010-12-20 03:59:22 UTC (rev 33799)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2010-12-20 05:26:25 UTC (rev 33800)
@@ -2444,7 +2444,7 @@
EditMesh *em = ((Mesh *)t->obedit->data)->edit_mesh;
EditFace *efa;
- if(!ED_uvedit_test(t->obedit)) return;
+ if(!ED_space_image_show_uvedit(sima, t->obedit)) return;
/* count */
for (efa= em->faces.first; efa; efa= efa->next) {
More information about the Bf-blender-cvs
mailing list