Differential D2842 Diff 9411 source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
Changeset View
Changeset View
Standalone View
Standalone View
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
| Show First 20 Lines • Show All 109 Lines • ▼ Show 20 Lines | BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : StrokeRenderer() | ||||
| freestyle_scene->r.safety.xmin = old_scene->r.safety.xmin; | freestyle_scene->r.safety.xmin = old_scene->r.safety.xmin; | ||||
| freestyle_scene->r.safety.ymin = old_scene->r.safety.ymin; | freestyle_scene->r.safety.ymin = old_scene->r.safety.ymin; | ||||
| freestyle_scene->r.safety.xmax = old_scene->r.safety.xmax; | freestyle_scene->r.safety.xmax = old_scene->r.safety.xmax; | ||||
| freestyle_scene->r.safety.ymax = old_scene->r.safety.ymax; | freestyle_scene->r.safety.ymax = old_scene->r.safety.ymax; | ||||
| freestyle_scene->r.osa = old_scene->r.osa; | freestyle_scene->r.osa = old_scene->r.osa; | ||||
| freestyle_scene->r.filtertype = old_scene->r.filtertype; | freestyle_scene->r.filtertype = old_scene->r.filtertype; | ||||
| freestyle_scene->r.gauss = old_scene->r.gauss; | freestyle_scene->r.gauss = old_scene->r.gauss; | ||||
| freestyle_scene->r.dither_intensity = old_scene->r.dither_intensity; | freestyle_scene->r.dither_intensity = old_scene->r.dither_intensity; | ||||
| BLI_strncpy(freestyle_scene->r.engine, old_scene->r.engine, sizeof(freestyle_scene->r.engine)); | BKE_viewrender_copy(&freestyle_scene->view_render, &old_scene->view_render); | ||||
| freestyle_scene->r.im_format.planes = R_IMF_PLANES_RGBA; | freestyle_scene->r.im_format.planes = R_IMF_PLANES_RGBA; | ||||
| freestyle_scene->r.im_format.imtype = R_IMF_IMTYPE_PNG; | freestyle_scene->r.im_format.imtype = R_IMF_IMTYPE_PNG; | ||||
| if (G.debug & G_DEBUG_FREESTYLE) { | if (G.debug & G_DEBUG_FREESTYLE) { | ||||
| printf("%s: %d thread(s)\n", __func__, BKE_render_num_threads(&freestyle_scene->r)); | printf("%s: %d thread(s)\n", __func__, BKE_render_num_threads(&freestyle_scene->r)); | ||||
| } | } | ||||
| // Render layer | // Render layer | ||||
| SceneRenderLayer *srl = (SceneRenderLayer *)freestyle_scene->r.layers.first; | SceneRenderLayer *srl = (SceneRenderLayer *)freestyle_scene->r.layers.first; | ||||
| ▲ Show 20 Lines • Show All 330 Lines • ▼ Show 20 Lines | void BlenderStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const | ||||
| if (_use_shading_nodes) { | if (_use_shading_nodes) { | ||||
| bNodeTree *nt = iStrokeRep->getNodeTree(); | bNodeTree *nt = iStrokeRep->getNodeTree(); | ||||
| Material *ma = (Material *)BLI_ghash_lookup(_nodetree_hash, nt); | Material *ma = (Material *)BLI_ghash_lookup(_nodetree_hash, nt); | ||||
| if (!ma) { | if (!ma) { | ||||
| ma = BlenderStrokeRenderer::GetStrokeShader(freestyle_bmain, nt, false); | ma = BlenderStrokeRenderer::GetStrokeShader(freestyle_bmain, nt, false); | ||||
| BLI_ghash_insert(_nodetree_hash, nt, ma); | BLI_ghash_insert(_nodetree_hash, nt, ma); | ||||
| } | } | ||||
| if (STREQ(freestyle_scene->r.engine, RE_engine_id_CYCLES)) { | if (STREQ(freestyle_scene->view_render.engine_id, RE_engine_id_CYCLES)) { | ||||
| PointerRNA scene_ptr, freestyle_scene_ptr; | PointerRNA scene_ptr, freestyle_scene_ptr; | ||||
| RNA_pointer_create(NULL, &RNA_Scene, old_scene, &scene_ptr); | RNA_pointer_create(NULL, &RNA_Scene, old_scene, &scene_ptr); | ||||
| RNA_pointer_create(NULL, &RNA_Scene, freestyle_scene, &freestyle_scene_ptr); | RNA_pointer_create(NULL, &RNA_Scene, freestyle_scene, &freestyle_scene_ptr); | ||||
| PointerRNA cycles_ptr = RNA_pointer_get(&scene_ptr, "cycles"); | PointerRNA cycles_ptr = RNA_pointer_get(&scene_ptr, "cycles"); | ||||
| PointerRNA freestyle_cycles_ptr = RNA_pointer_get(&freestyle_scene_ptr, "cycles"); | PointerRNA freestyle_cycles_ptr = RNA_pointer_get(&freestyle_scene_ptr, "cycles"); | ||||
| int flag; | int flag; | ||||
| ▲ Show 20 Lines • Show All 490 Lines • Show Last 20 Lines | |||||