[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12718] trunk/blender/source/blender/src: With faceselecting merged in editmode, we should also allow the active
Ton Roosendaal
ton at blender.org
Thu Nov 29 14:05:38 CET 2007
Revision: 12718
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12718
Author: ton
Date: 2007-11-29 14:05:38 +0100 (Thu, 29 Nov 2007)
Log Message:
-----------
With faceselecting merged in editmode, we should also allow the active
material slot ("index") to update in the UI when you select a single face.
Works nice!
Modified Paths:
--------------
trunk/blender/source/blender/src/buttons_editing.c
trunk/blender/source/blender/src/editmesh_mods.c
Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c 2007-11-29 12:40:53 UTC (rev 12717)
+++ trunk/blender/source/blender/src/buttons_editing.c 2007-11-29 13:05:38 UTC (rev 12718)
@@ -410,7 +410,6 @@
return;
}
}
- efa= efa->next;
}
}
else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) {
Modified: trunk/blender/source/blender/src/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/src/editmesh_mods.c 2007-11-29 12:40:53 UTC (rev 12717)
+++ trunk/blender/source/blender/src/editmesh_mods.c 2007-11-29 13:05:38 UTC (rev 12718)
@@ -82,6 +82,7 @@
#include "BIF_interface.h"
#include "BIF_meshtools.h"
#include "BIF_mywindow.h"
+#include "BIF_previewrender.h"
#include "BIF_resources.h"
#include "BIF_screen.h"
#include "BIF_space.h"
@@ -2126,6 +2127,12 @@
allqueue(REDRAWIMAGE, 0);
allqueue(REDRAWBUTSEDIT, 0); /* for the texture face panel */
}
+ if (efa && efa->mat_nr != G.obedit->actcol-1) {
+ G.obedit->actcol= efa->mat_nr+1;
+ allqueue(REDRAWBUTSEDIT, 0);
+ allqueue(REDRAWBUTSSHADING, 0);
+ BIF_preview_changed(ID_MA);
+ }
}
rightmouse_transform();
More information about the Bf-blender-cvs
mailing list