diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-10-03 10:22:07 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-03 10:22:07 +0400 |
commit | b39b6c7fdaf1827334b9945a3c3383dbf9e78d36 (patch) | |
tree | 1635b08f45bb8be294b742f4f1e788527ddaf021 /source/blender | |
parent | cda535dced20f7f4ed7caa2f96f603058917064f (diff) | |
parent | 50af4d208d7d2f3cbc789e91e54d87adf37590fb (diff) |
Merge branch 'master' into dyntopo_holes
Diffstat (limited to 'source/blender')
10 files changed, 39 insertions, 31 deletions
diff --git a/source/blender/bmesh/tools/bmesh_region_match.c b/source/blender/bmesh/tools/bmesh_region_match.c index 3d1b6bfbcf2..224e9a15a38 100644 --- a/source/blender/bmesh/tools/bmesh_region_match.c +++ b/source/blender/bmesh/tools/bmesh_region_match.c @@ -23,6 +23,16 @@ * * Given a contiguous region of faces, * find multiple matching regions (based on topology) and return them. + * + * Implementation: + * + * - Given a face region, find its topological center. + * - Compare this with other vertices surrounding geometry with this ones. + * (reduce the search space by creating a connectivity ID per vertex + * and only run comprehensive tests on those). + * - All hashes must be order independent so matching topology can be identified. + * - The term UUID here doesn't mean each ID is initially unique. + * (uniqueness is improved by re-hashing with connected data). */ #include <string.h> diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index d81a8d7eb4c..bbf4447dd72 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -171,10 +171,10 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op) export_transformation_type, open_sim); - if(export_count == 0) { + if (export_count == 0) { BKE_report(op->reports, RPT_WARNING, "Export file is empty"); return OPERATOR_CANCELLED; - } + } else { char buff[100]; sprintf(buff, "Exported %d Objects", export_count); diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index 12be32b764e..b5508ef8b82 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -362,9 +362,9 @@ static void edgering_select(RingSelOpData *lcd) } BMW_init(&walker, em->bm, BMW_EDGERING, - BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, - BMW_FLAG_TEST_HIDDEN, - BMW_NIL_LAY); + BMW_MASK_NOP, BMW_MASK_NOP, BMW_MASK_NOP, + BMW_FLAG_TEST_HIDDEN, + BMW_NIL_LAY); for (eed = BMW_begin(&walker, eed_start); eed; eed = BMW_step(&walker)) { BM_edge_select_set(em->bm, eed, true); diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 31ef76f0bb9..c7ff9f0089f 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -2054,7 +2054,6 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve initTransInfo(C, t, op, event); if (t->spacetype == SPACE_VIEW3D) { - //calc_manipulator_stats(curarea); initTransformOrientation(C, t); t->draw_handle_apply = ED_region_draw_cb_activate(t->ar->type, drawTransformApply, t, REGION_DRAW_PRE_VIEW); @@ -4069,7 +4068,7 @@ static void initTranslation(TransInfo *t) /* this space uses time translate */ BKE_report(t->reports, RPT_ERROR, "Use 'Time_Translate' transform mode instead of 'Translation' mode " - "for translating keyframes in Dope Sheet Editor"); + "for translating keyframes in Dope Sheet Editor"); t->state = TRANS_CANCEL; } diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 012f9185d8b..67d55639528 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -537,7 +537,6 @@ void restoreBones(TransInfo *t); /*********************** exported from transform_manipulator.c ********** */ bool gimbal_axis(struct Object *ob, float gmat[3][3]); /* return 0 when no gimbal for selection */ -int calc_manipulator_stats(const struct bContext *C); /*********************** TransData Creation and General Handling *********** */ void createTransData(struct bContext *C, TransInfo *t); diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 2161e52d7b2..37a6d50e149 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -262,7 +262,7 @@ bool gimbal_axis(Object *ob, float gmat[3][3]) /* centroid, boundbox, of selection */ /* returns total items selected */ -int calc_manipulator_stats(const bContext *C) +static int calc_manipulator_stats(const bContext *C) { ScrArea *sa = CTX_wm_area(C); ARegion *ar = CTX_wm_region(C); diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp index 9c9cd88f188..a5e526fc490 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp @@ -63,14 +63,14 @@ void FEdgeXDetector::processShapes(WingedEdge& we) WXFace *wxf = dynamic_cast<WXFace*>(*wf); wxf->Clear(); } - _computeViewIndependant = true; + _computeViewIndependent = true; } - else if (!(wxs)->getComputeViewIndependantFlag()) { + else if (!(wxs)->getComputeViewIndependentFlag()) { wxs->Reset(); - _computeViewIndependant = false; + _computeViewIndependent = false; } else { - _computeViewIndependant = true; + _computeViewIndependent = true; } preProcessShape(wxs); if (progressBarDisplay) @@ -97,8 +97,8 @@ void FEdgeXDetector::processShapes(WingedEdge& we) if (progressBarDisplay) _pProgressBar->setProgress(_pProgressBar->getProgress() + 1); - wxs->setComputeViewIndependantFlag(false); - _computeViewIndependant = false; + wxs->setComputeViewIndependentFlag(false); + _computeViewIndependent = false; _changes = false; // reset user data @@ -187,8 +187,8 @@ void FEdgeXDetector::computeCurvatures(WXVertex *vertex) CurvatureInfo *C; float radius = _sphereRadius * _meanEdgeSize; - // view independant stuff - if (_computeViewIndependant) { + // view independent stuff + if (_computeViewIndependent) { C = new CurvatureInfo(); vertex->setCurvatures(C); OGF::NormalCycle ncycle; @@ -333,7 +333,7 @@ void FEdgeXDetector::ProcessSilhouetteEdge(WXEdge *iEdge) ///////// void FEdgeXDetector::processBorderShape(WXShape *iWShape) { - if (!_computeViewIndependant) + if (!_computeViewIndependent) return; // Make a pass on the edges to detect the BORDER vector<WEdge*>::iterator we, weend; @@ -358,7 +358,7 @@ void FEdgeXDetector::ProcessBorderEdge(WXEdge *iEdge) ///////// void FEdgeXDetector::processCreaseShape(WXShape *iWShape) { - if (!_computeViewIndependant) + if (!_computeViewIndependent) return; // Make a pass on the edges to detect the CREASE @@ -390,7 +390,7 @@ void FEdgeXDetector::processRidgesAndValleysShape(WXShape *iWShape) // Don't forget to add the built layer to the face at the end of the ProcessFace: //iFace->AddSmoothLayer(faceLayer); - if (!_computeViewIndependant) + if (!_computeViewIndependent) return; // Here the curvatures must already have been computed @@ -684,7 +684,7 @@ void FEdgeXDetector::postProcessSuggestiveContourFace(WXFace *iFace) //////////////////// void FEdgeXDetector::processMaterialBoundaryShape(WXShape *iWShape) { - if (!_computeViewIndependant) + if (!_computeViewIndependent) return; // Make a pass on the edges to detect material boundaries vector<WEdge*>::iterator we, weend; diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h index 8adf685a6eb..8170fc5baab 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h @@ -57,7 +57,7 @@ public: { _pProgressBar = NULL; _pRenderMonitor = NULL; - _computeViewIndependant = true; + _computeViewIndependent = true; _bbox_diagonal = 1.0; _meanEdgeSize = 0; _computeRidgesAndValleys = true; @@ -213,7 +213,7 @@ protected: Vec3r _Viewpoint; real _bbox_diagonal; // diagonal of the current processed shape bbox //oldtmp values - bool _computeViewIndependant; + bool _computeViewIndependent; real _meanK1; real _meanKr; real _minK1; diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h index ce9749369fc..3c9ec7a7e3d 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h @@ -718,18 +718,18 @@ public: typedef WXShape type_name; protected: - bool _computeViewIndependant; // flag to indicate whether the view independant stuff must be computed or not + bool _computeViewIndependent; // flag to indicate whether the view independent stuff must be computed or not public: inline WXShape() : WShape() { - _computeViewIndependant = true; + _computeViewIndependent = true; } /*! copy constructor */ inline WXShape(WXShape& iBrother) : WShape(iBrother) { - _computeViewIndependant = iBrother._computeViewIndependant; + _computeViewIndependent = iBrother._computeViewIndependent; } virtual WShape *duplicate() @@ -740,14 +740,14 @@ public: virtual ~WXShape() {} - inline bool getComputeViewIndependantFlag() const + inline bool getComputeViewIndependentFlag() const { - return _computeViewIndependant; + return _computeViewIndependent; } - inline void setComputeViewIndependantFlag(bool iFlag) + inline void setComputeViewIndependentFlag(bool iFlag) { - _computeViewIndependant = iFlag; + _computeViewIndependent = iFlag; } /*! designed to build a specialized WFace for use in MakeFace */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 09639e86bd0..b9a79a85455 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1893,7 +1893,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar col = uiLayoutColumn(split, false); uiItemL(col, IFACE_("Links"), ICON_NONE); uiItemStringO(col, IFACE_("Support an Open Animation Movie"), ICON_URL, "WM_OT_url_open", "url", - "http://cloud.blender.org/gooseberry"); + "https://cloud.blender.org/join"); uiItemStringO(col, IFACE_("Donations"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/foundation/donation-payment/"); uiItemStringO(col, IFACE_("Credits"), ICON_URL, "WM_OT_url_open", "url", |