[Bf-blender-cvs] [a1f8cb6] master: Fix T40423: UV Editing 'Draw Other Objects' fails with Cycles
Campbell Barton
noreply at git.blender.org
Thu Jun 5 06:01:18 CEST 2014
Commit: a1f8cb6dbb196026a7c8bf0794959ac7bf372cf7
Author: Campbell Barton
Date: Thu Jun 5 13:55:50 2014 +1000
https://developer.blender.org/rBa1f8cb6dbb196026a7c8bf0794959ac7bf372cf7
Fix T40423: UV Editing 'Draw Other Objects' fails with Cycles
===================================================================
M source/blender/blenlib/BLI_bitmap.h
M source/blender/editors/uvedit/uvedit_draw.c
===================================================================
diff --git a/source/blender/blenlib/BLI_bitmap.h b/source/blender/blenlib/BLI_bitmap.h
index cf10fe5..3d56156 100644
--- a/source/blender/blenlib/BLI_bitmap.h
+++ b/source/blender/blenlib/BLI_bitmap.h
@@ -55,6 +55,10 @@ typedef unsigned int BLI_bitmap;
((BLI_bitmap *)MEM_callocN(BLI_BITMAP_SIZE(_tot), \
_alloc_string))
+/* allocate a bitmap on the stack */
+#define BLI_BITMAP_NEW_ALLOCA(_tot) \
+ ((BLI_bitmap *)memset(alloca(BLI_BITMAP_SIZE(_tot)), 0, BLI_BITMAP_SIZE(_tot)))
+
/* get the value of a single bit at '_index' */
#define BLI_BITMAP_GET(_bitmap, _index) \
((_bitmap)[(_index) >> BLI_BITMAP_POWER] & \
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index ce4b97e..8be56fd 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -42,11 +42,13 @@
#include "BLI_math.h"
#include "BLI_utildefines.h"
+#include "BLI_alloca.h"
+#include "BLI_buffer.h"
+#include "BLI_bitmap.h"
#include "BKE_DerivedMesh.h"
#include "BKE_editmesh.h"
-
-#include "BLI_buffer.h"
+#include "BKE_scene.h"
#include "BIF_gl.h"
#include "BIF_glutil.h"
@@ -64,6 +66,7 @@
/* use editmesh tessface */
#define USE_EDBM_LOOPTRIS
+static void draw_uvs_lineloop_bmface(BMFace *efa, const int cd_loop_uv_offset);
void draw_image_cursor(ARegion *ar, const float cursor[2])
{
@@ -130,9 +133,7 @@ static void draw_uvs_shadow(Object *obedit)
BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMesh *bm = em->bm;
BMFace *efa;
- BMLoop *l;
- BMIter iter, liter;
- MLoopUV *luv;
+ BMIter iter;
const int cd_loop_uv_offset = CustomData_get_offset(&bm->ldata, CD_MLOOPUV);
@@ -140,12 +141,7 @@ static void draw_uvs_shadow(Object *obedit)
UI_ThemeColor(TH_UV_SHADOW);
BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
- glBegin(GL_LINE_LOOP);
- BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
- luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
- glVertex2fv(luv->uv);
- }
- glEnd();
+ draw_uvs_lineloop_bmface(efa, cd_loop_uv_offset);
}
}
@@ -354,7 +350,105 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
BLI_buffer_free(&tf_uvorig_buf);
}
-static void draw_uvs_other(Scene *scene, Object *obedit, Image *curimage)
+static void draw_uvs_lineloop_bmface(BMFace *efa, const int cd_loop_uv_offset)
+{
+ BMIter liter;
+ BMLoop *l;
+ MLoopUV *luv;
+
+ glBegin(GL_LINE_LOOP);
+ BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
+ luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
+ glVertex2fv(luv->uv);
+ }
+ glEnd();
+}
+
+static void draw_uvs_lineloop_mpoly(Mesh *me, MPoly *mpoly)
+{
+ MLoopUV *mloopuv;
+ int i;
+
+ glBegin(GL_LINE_LOOP);
+ mloopuv = &me->mloopuv[mpoly->loopstart];
+ for (i = mpoly->totloop; i != 0; i--, mloopuv++) {
+ glVertex2fv(mloopuv->uv);
+ }
+ glEnd();
+}
+
+static void draw_uvs_other_mesh_texface(Object *ob, const Image *curimage)
+{
+ Mesh *me = ob->data;
+ MPoly *mpoly = me->mpoly;
+ MTexPoly *mtpoly = me->mtpoly;
+ int a;
+
+ if (me->mloopuv == NULL) {
+ return;
+ }
+
+ for (a = me->totpoly; a != 0; a--, mpoly++, mtpoly++) {
+ if (mtpoly->tpage != curimage) {
+ continue;
+ }
+
+ draw_uvs_lineloop_mpoly(me, mpoly);
+ }
+}
+static void draw_uvs_other_mesh_new_shading(Object *ob, const Image *curimage)
+{
+ Mesh *me = ob->data;
+ MPoly *mpoly = me->mpoly;
+ int a;
+ BLI_bitmap *mat_test_array;
+ bool ok = false;
+
+ if (me->mloopuv == NULL) {
+ return;
+ }
+
+ if (ob->totcol == 0) {
+ return;
+ }
+
+ mat_test_array = BLI_BITMAP_NEW_ALLOCA(ob->totcol);
+
+ for (a = 0; a < ob->totcol; a++) {
+ Image *image;
+ ED_object_get_active_image(ob, a + 1, &image, NULL, NULL);
+ if (image == curimage) {
+ BLI_BITMAP_SET(mat_test_array, a);
+ ok = true;
+ }
+ }
+
+ if (ok == false) {
+ return;
+ }
+
+ for (a = me->totpoly; a != 0; a--, mpoly++) {
+ const int mat_nr = mpoly->mat_nr;
+ if ((mat_nr >= ob->totcol) ||
+ (BLI_BITMAP_GET(mat_test_array, mat_nr)) == 0)
+ {
+ continue;
+ }
+
+ draw_uvs_lineloop_mpoly(me, mpoly);
+ }
+}
+static void draw_uvs_other_mesh(Object *ob, const Image *curimage, const bool new_shading_nodes)
+{
+ if (new_shading_nodes) {
+ draw_uvs_other_mesh_new_shading(ob, curimage);
+ }
+ else {
+ draw_uvs_other_mesh_texface(ob, curimage);
+ }
+}
+
+static void draw_uvs_other(Scene *scene, Object *obedit, const Image *curimage, const bool new_shading_nodes)
{
Base *base;
@@ -367,59 +461,23 @@ static void draw_uvs_other(Scene *scene, Object *obedit, Image *curimage)
if (!(base->lay & scene->lay)) continue;
if (ob->restrictflag & OB_RESTRICT_VIEW) continue;
- if ((ob->type == OB_MESH) && (ob != obedit)) {
- Mesh *me = ob->data;
-
- if (me->mtpoly) {
- MPoly *mpoly = me->mpoly;
- MTexPoly *mtpoly = me->mtpoly;
- MLoopUV *mloopuv;
- int a, b;
-
- for (a = me->totpoly; a > 0; a--, mtpoly++, mpoly++) {
- if (mtpoly->tpage == curimage) {
- glBegin(GL_LINE_LOOP);
-
- mloopuv = me->mloopuv + mpoly->loopstart;
- for (b = 0; b < mpoly->totloop; b++, mloopuv++) {
- glVertex2fv(mloopuv->uv);
- }
- glEnd();
- }
- }
- }
+ if ((ob->type == OB_MESH) && (ob != obedit) && ((Mesh *)ob->data)->mloopuv) {
+ draw_uvs_other_mesh(ob, curimage, new_shading_nodes);
}
}
}
static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, Object *ob)
{
- Mesh *me = ob->data;
+ const bool new_shading_nodes = BKE_scene_use_new_shading_nodes(scene);
Image *curimage = ED_space_image(sima);
- if (sima->flag & SI_DRAW_OTHER)
- draw_uvs_other(scene, ob, curimage);
+ if (sima->flag & SI_DRAW_OTHER) {
+ draw_uvs_other(scene, ob, curimage, new_shading_nodes);
+ }
UI_ThemeColor(TH_UV_SHADOW);
-
- if (me->mtpoly) {
- MPoly *mpoly = me->mpoly;
- MTexPoly *tface = me->mtpoly;
- MLoopUV *mloopuv;
- int a, b;
-
- for (a = me->totpoly; a > 0; a--, tface++, mpoly++) {
- if (tface->tpage == curimage) {
- glBegin(GL_LINE_LOOP);
-
- mloopuv = me->mloopuv + mpoly->loopstart;
- for (b = 0; b < mpoly->totloop; b++, mloopuv++) {
- glVertex2fv(mloopuv->uv);
- }
- glEnd();
- }
- }
- }
+ draw_uvs_other_mesh(ob, curimage, new_shading_nodes);
}
#ifdef USE_EDBM_LOOPTRIS
@@ -442,6 +500,7 @@ static void draw_uvs_looptri(BMEditMesh *em, unsigned int *r_loop_index, const i
/* draws uv's in the image space */
static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
{
+ const bool new_shading_nodes = BKE_scene_use_new_shading_nodes(scene);
ToolSettings *ts;
Mesh *me = obedit->data;
BMEditMesh *em = me->edit_btmesh;
@@ -477,9 +536,21 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
/* draw other uvs */
if (sima->flag & SI_DRAW_OTHER) {
- Image *curimage = (activetf) ? activetf->tpage : ima;
+ Image *curimage;
- draw_uvs_other(scene, obedit, curimage);
+ if (new_shading_nodes) {
+ if (efa_act) {
+ ED_object_get_active_image(obedit, efa_act->mat_nr + 1, &curimage, NULL, NULL);
+ }
+ else {
+ curimage = ima;
+ }
+ }
+ else {
+ curimage = (activetf) ? activetf->tpage : ima;
+ }
+
+ draw_uvs_other(scene, obedit, curimage, new_shading_nodes);
}
/* 1. draw shadow mesh */
@@ -636,22 +707,12 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
if (tf) {
cpack(0x111111);
- glBegin(GL_LINE_LOOP);
- BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
- luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
- glVertex2fv(luv->uv);
- }
- glEnd();
+ draw_uvs_lineloop_bmface(efa, cd_loop_uv_offset);
setlinestyle(2);
cpack(0x909090);
- glBegin(GL_LINE_LOOP);
- BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
- luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
- glVertex2fv(luv->uv);
- }
- glEnd();
+ draw_uvs_lineloop_bmface(efa, cd_loop_uv_offset);
setlinestyle(0);
}
@@ -666,12 +727,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
continue;
- glBegin(GL_LINE_LOOP);
- BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
- luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
- glVertex2fv(luv->uv);
- }
- glEnd();
+ draw_uvs_lineloop_bmface(efa, cd_loop_uv_offset);
}
break;
case SI_UVDT_OUTLINE:
@@ -682,12 +738,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
continue;
- glBegin(GL_LINE_LOOP);
- BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
- luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
- glVertex2fv(luv->uv);
- }
- glEnd();
+ draw_uvs_lineloop_bmface(efa, cd_loop_uv_offset);
}
glLineWidth(1);
@@ -745,12 +796,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
continue;
- glBegin(GL_LINE_LOOP);
- BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
- luv = BM_ELEM_CD_GET_VOID_P(l, cd_loop_uv_offset);
- glVertex2fv(luv->uv);
- }
- glEnd();
+ draw_uvs_lineloop_bmface(efa, cd_loop_uv_offset);
}
}
More information about the Bf-blender-cvs
mailing list