bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Campbell Barton 2014-08-21 00:10:57 +10:00
parent ccf7b391cd
commit d93c07d987
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
View File

@ -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)

2
source/blender/blenkernel/intern/DerivedMesh.c
View File

@ -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);
}

4
source/blender/blenkernel/intern/curve.c
View File

@ -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;

2
source/blender/bmesh/tools/bmesh_intersect.c
View File

@ -27,7 +27,7 @@
*
* Supported:
* - Concave faces.
* - Non-planare faces.
* - Non-planar faces.
* - Custom-data (UV's etc).
*
* Unsupported:

2
source/blender/makesdna/DNA_linestyle_types.h
View File

@ -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;