X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Frendermethod.cpp;h=78b937d017f40ae069ff0900082ca4675900dae1;hp=ddbe4f1e457e83760dc699bce85ad52dd64ac29e;hb=d9c437291135255422c71918cd0cab8a735848af;hpb=5871764de7aa23d2c40cac03ad9d07088fb57e06 diff --git a/source/materials/rendermethod.cpp b/source/materials/rendermethod.cpp index ddbe4f1e..78b937d0 100644 --- a/source/materials/rendermethod.cpp +++ b/source/materials/rendermethod.cpp @@ -34,6 +34,8 @@ void RenderMethod::maybe_create_material_shader() extra_spec["use_shadow_map"] = true; if(image_based_lighting) extra_spec["use_image_based_lighting"] = true; + if(instancing) + extra_spec["use_instancing"] = true; shprog = material->create_compatible_shader(extra_spec); @@ -152,8 +154,9 @@ void RenderMethod::Loader::init_actions() add("blend", &Loader::blend); add("blend", &Loader::blend_factors); add("face_cull", &RenderMethod::face_cull); - add("shader", &Loader::shader); + add("shader", &Loader::shader); add("image_based_lighting", &RenderMethod::image_based_lighting); + add("instancing", &RenderMethod::instancing); add("material", &Loader::material_inline); add("material", &Loader::material); add("material_slot", &RenderMethod::material_slot);