Revision: 40176
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40176
Author: campbellbarton
Date: 2011-09-13 05:00:54 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
fix [#28635] Mirror Modifier - Clipping still active when modifier is disabled
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/editmesh_lib.c
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/transform/transform_generics.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_lib.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_lib.c 2011-09-12
23:07:33 UTC (rev 40175)
+++ trunk/blender/source/blender/editors/mesh/editmesh_lib.c 2011-09-13
05:00:54 UTC (rev 40176)
@@ -1310,7 +1310,7 @@
* of the cases above to handle edges on the line of symmetry.
*/
for (; md; md=md->next) {
- if (md->type==eModifierType_Mirror) {
+ if ((md->type==eModifierType_Mirror) && (md->mode &
eModifierMode_Realtime)) {
MirrorModifierData *mmd = (MirrorModifierData*) md;
if(mmd->flag & MOD_MIR_CLIPPING) {
@@ -1597,7 +1597,7 @@
* of the cases above to handle edges on the line of symmetry.
*/
for (; md; md=md->next) {
- if (md->type==eModifierType_Mirror) {
+ if ((md->type==eModifierType_Mirror) && (md->mode &
eModifierMode_Realtime)) {
MirrorModifierData *mmd = (MirrorModifierData*) md;
if(mmd->flag & MOD_MIR_CLIPPING) {
Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2011-09-12
23:07:33 UTC (rev 40175)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2011-09-13
05:00:54 UTC (rev 40176)
@@ -4148,7 +4148,7 @@
* are within tolerance of the plane(s) of reflection
*/
for(md=obedit->modifiers.first; md; md=md->next) {
- if(md->type==eModifierType_Mirror) {
+ if((md->type==eModifierType_Mirror) && (md->mode &
eModifierMode_Realtime)) {
MirrorModifierData *mmd = (MirrorModifierData*) md;
if(mmd->flag & MOD_MIR_CLIPPING) {
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2011-09-12
23:07:33 UTC (rev 40175)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2011-09-13
05:00:54 UTC (rev 40176)
@@ -2675,7 +2675,7 @@
}
for (; md; md=md->next) {
- if (md->type==eModifierType_Mirror) {
+ if ((md->type==eModifierType_Mirror) && (md->mode &
eModifierMode_Realtime)) {
MirrorModifierData *mmd = (MirrorModifierData*) md;
if(mmd->flag & MOD_MIR_CLIPPING) {
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c
2011-09-12 23:07:33 UTC (rev 40175)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c
2011-09-13 05:00:54 UTC (rev 40176)
@@ -144,7 +144,7 @@
int axis = 0;
for (; md; md=md->next) {
- if (md->type==eModifierType_Mirror) {
+ if ((md->type==eModifierType_Mirror) && (md->mode &
eModifierMode_Realtime)) {
MirrorModifierData *mmd = (MirrorModifierData*) md;
if(mmd->flag & MOD_MIR_CLIPPING) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
