X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;fp=effect_chain.h;h=54cf0e5d88869aec8e7e8e812bb0f4a44ec6797e;hp=c292b38b4a0b85642d8d5b7970117a5ae64b11c3;hb=f34b1c36acd27944f00885edfc55363432bfec8e;hpb=0ed2c7fe3876a49d1565e3425e5a491206ffe32d diff --git a/effect_chain.h b/effect_chain.h index c292b38..54cf0e5 100644 --- a/effect_chain.h +++ b/effect_chain.h @@ -216,11 +216,11 @@ class EffectChain { public: // Aspect: e.g. 16.0f, 9.0f for 16:9. // resource_pool is a pointer to a ResourcePool with which to share shaders - // and other resources (see resource_pool.h). If NULL (the default), + // and other resources (see resource_pool.h). If nullptr (the default), // will create its own that is not shared with anything else. Does not take // ownership of the passed-in ResourcePool, but will naturally take ownership // of its own internal one if created. - EffectChain(float aspect_nom, float aspect_denom, ResourcePool *resource_pool = NULL); + EffectChain(float aspect_nom, float aspect_denom, ResourcePool *resource_pool = nullptr); ~EffectChain(); // User API: @@ -391,7 +391,7 @@ public: Effect *last_added_effect() { if (nodes.empty()) { - return NULL; + return nullptr; } else { return nodes.back()->effect; }