forked from bartvdbraak/blender
Cleanup
This commit is contained in:
parent
ccf7b391cd
commit
d93c07d987
@ -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)
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -27,7 +27,7 @@
|
||||
*
|
||||
* Supported:
|
||||
* - Concave faces.
|
||||
* - Non-planare faces.
|
||||
* - Non-planar faces.
|
||||
* - Custom-data (UV's etc).
|
||||
*
|
||||
* Unsupported:
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user