diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-11 13:31:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-11 13:31:00 +0400 |
commit | 1e90add66cc4bc15faa1319b09280c987a33649d (patch) | |
tree | fdb96902535f3e7b74a885809a7325dcb3f24825 /source/blender/blenkernel/intern | |
parent | b25496087351c9f458596f64abe2ba96a2316a9e (diff) |
more syncing with trunk.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 7 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 5 |
4 files changed, 6 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 3f1c897b63f..6218dc9382c 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -57,7 +57,6 @@ #include "DNA_lattice_types.h" #include "DNA_scene_types.h" #include "DNA_text_types.h" -#include "DNA_windowmanager_types.h" #include "BKE_action.h" @@ -2540,9 +2539,9 @@ static void locktrack_evaluate (bConstraint *con, bConstraintOb *cob, ListBase * } break; default: - { - unit_m3(totmat); - } + { + unit_m3(totmat); + } break; } /* Block to keep matrix heading */ diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 372eb1fe6f1..51f1cd61e7c 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -306,8 +306,7 @@ int modifier_isEnabled(struct Scene *scene, ModifierData *md, int required_mode) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); - if (scene) - md->scene= scene; + md->scene= scene; if((md->mode & required_mode) != required_mode) return 0; if(mti->isDisabled && mti->isDisabled(md, required_mode == eModifierMode_Render)) return 0; diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index ce956fcb236..653e7612a17 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -44,7 +44,6 @@ #include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" #include "DNA_scene_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_editVert.h" #include "BLI_math.h" diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 704b0098cfa..506fcf7db78 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -533,7 +533,7 @@ static int ss_sync_from_derivedmesh(CCGSubSurf *ss, DerivedMesh *dm, for(i = 0; i < totedge; i++, me++) { CCGEdge *e; float crease; - + crease = useFlatSubdiv ? creaseFactor : me->crease * creaseFactor / 255.0f; @@ -1525,6 +1525,7 @@ static void ccgDM_drawFacesSolid(DerivedMesh *dm, float (*partial_redraw_planes) int step = (fast)? gridSize-1: 1; ccgdm_pbvh_update(ccgdm); + if(ccgdm->pbvh && ccgdm->multires.mmd && !fast) { if(dm->numFaceData) { /* should be per face */ @@ -1539,8 +1540,6 @@ static void ccgDM_drawFacesSolid(DerivedMesh *dm, float (*partial_redraw_planes) return; } - gridSize = ccgSubSurf_getGridSize(ss); - fi = ccgSubSurf_getFaceIterator(ss); for (; !ccgFaceIterator_isStopped(fi); ccgFaceIterator_next(fi)) { CCGFace *f = ccgFaceIterator_getCurrent(fi); |