diff options
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/curve.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_intersect.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_linestyle_types.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c b/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c index 9df9a56f8b8..01e301f927e 100644 --- a/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c +++ b/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c @@ -30,14 +30,14 @@ /* It is to be noted that these implementations are linked in as * 'extern "C"' calls from GHOST_NDOFManagerCocoa. - + * * This is done in order to * preserve weak linking capability (which as of clang-3.3 and xcode5 * breaks weak linking when there is name mangling of c++ libraries.) * * We need to have the weak linked file as pure C. Therefore we build a * compiled bridge from the real weak linked calls and the calls within C++ - + * */ OSErr GHOST_NDOFManager3Dconnexion_available(void) diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 7771b451af4..0db9f991ce8 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -522,7 +522,7 @@ MTFace *DM_paint_uvlayer_active_get(DerivedMesh *dm, int mat_nr) tf_base = CustomData_get_layer_named(&dm->faceData, CD_MTFACE, dm->mat[mat_nr]->texpaintslot[dm->mat[mat_nr]->paint_active_slot].uvname); /* This can fail if we have changed the name in the UV layer list and have assigned the old name in the material - * texture slot.*/ + * texture slot.*/ if (!tf_base) tf_base = CustomData_get_layer(&dm->faceData, CD_MTFACE); } diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 31a5cac01a9..671a18efc5b 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -2544,8 +2544,8 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render) /* segbevcount alsp requires seglen. */ const bool need_seglen = - ELEM(cu->bevfac1_mapping,CU_BEVFAC_MAP_SEGMENT, CU_BEVFAC_MAP_SPLINE) || - ELEM(cu->bevfac2_mapping,CU_BEVFAC_MAP_SEGMENT, CU_BEVFAC_MAP_SPLINE); + ELEM(cu->bevfac1_mapping, CU_BEVFAC_MAP_SEGMENT, CU_BEVFAC_MAP_SPLINE) || + ELEM(cu->bevfac2_mapping, CU_BEVFAC_MAP_SEGMENT, CU_BEVFAC_MAP_SPLINE); bev = &ob->curve_cache->bev; diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c index 199cbb9397e..9cf38bb144e 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.c +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -27,7 +27,7 @@ * * Supported: * - Concave faces. - * - Non-planare faces. + * - Non-planar faces. * - Custom-data (UV's etc). * * Unsupported: diff --git a/source/blender/makesdna/DNA_linestyle_types.h b/source/blender/makesdna/DNA_linestyle_types.h index b90aaa7da8c..bac03b4efd7 100644 --- a/source/blender/makesdna/DNA_linestyle_types.h +++ b/source/blender/makesdna/DNA_linestyle_types.h @@ -432,7 +432,7 @@ typedef struct FreestyleLineStyle { unsigned short split_dash2, split_gap2; unsigned short split_dash3, split_gap3; int sort_key, integration_type; - float texstep; + float texstep; short texact, pr_texture; short use_nodes, pad; unsigned short dash1, gap1, dash2, gap2, dash3, gap3; |