diff options
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface')
3 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 7bceb036846..e1763514e08 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -222,7 +222,7 @@ void BlenderFileLoader::clipTriangle(int numTris, bool em1, bool em2, bool em3, - int clip[3]) + const int clip[3]) { float *v[3], *n[3]; bool em[3]; @@ -746,7 +746,7 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id) detriList.push_back(detri); } - if (detriList.size() > 0) { + if (!detriList.empty()) { vector<detri_t>::iterator v; for (v = detriList.begin(); v != detriList.end(); v++) { detri_t detri = (*v); @@ -795,7 +795,7 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id) // sets the id of the rep rep->setId(Id(id, 0)); rep->setName(ob->id.name + 2); - rep->setLibraryPath(ob->id.lib ? ob->id.lib->name : ""); + rep->setLibraryPath(ob->id.lib ? ob->id.lib->filepath : ""); const BBox<Vec3r> bbox = BBox<Vec3r>(Vec3r(ls.minBBox[0], ls.minBBox[1], ls.minBBox[2]), Vec3r(ls.maxBBox[0], ls.maxBBox[1], ls.maxBBox[2])); diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index ad6379d5f52..9d8b7e55fbb 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -37,7 +37,6 @@ #include "MEM_guardedalloc.h" -extern "C" { #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" @@ -56,7 +55,6 @@ extern "C" { #include "BLI_iterator.h" #include "BLI_listbase.h" #include "BLI_math.h" -} #include "DEG_depsgraph_query.h" @@ -128,7 +126,7 @@ class BlenderFileLoader { bool em1, bool em2, bool em3, - int clip[3]); + const int clip[3]); void addTriangle(struct LoaderState *ls, float v1[3], float v2[3], diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 0f4263162a6..51ac281e330 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -34,8 +34,6 @@ using namespace Freestyle; #include "MEM_guardedalloc.h" -extern "C" { - #include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_freestyle_types.h" @@ -65,6 +63,8 @@ extern "C" { #include "FRS_freestyle.h" +extern "C" { + #define DEFAULT_SPHERE_RADIUS 1.0f #define DEFAULT_DKR_EPSILON 0.0f @@ -341,8 +341,8 @@ static void prepare(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph) const char *id_name = module_conf->script->id.name + 2; if (G.debug & G_DEBUG_FREESTYLE) { cout << " " << layer_count + 1 << ": " << id_name; - if (module_conf->script->name) { - cout << " (" << module_conf->script->name << ")"; + if (module_conf->script->filepath) { + cout << " (" << module_conf->script->filepath << ")"; } cout << endl; } |