5 files changed, 18 insertions, 13 deletions
diff --git a/source/blender/render/intern/engine.c b/source/blender/render/intern/engine.c
index 657cd1f606b..75b3f2db249 100644
--- a/source/blender/render/intern/engine.c
+++ b/source/blender/render/intern/engine.c
@@ -128,6 +128,19 @@ bool RE_engine_is_opengl(RenderEngineType *render_type)
   return (render_type->draw_engine != NULL) && DRW_engine_render_support(render_type->draw_engine);
 }
 
+bool RE_engine_supports_alembic_procedural(const RenderEngineType *render_type, Scene *scene)
+{
+  if ((render_type->flag & RE_USE_ALEMBIC_PROCEDURAL) == 0) {
+    return false;
+  }
+
+  if (BKE_scene_uses_cycles(scene) && !BKE_scene_uses_cycles_experimental_features(scene)) {
+    return false;
+  }
+
+  return true;
+}
+
 /* Create, Free */
 
 RenderEngine *RE_engine_create(RenderEngineType *type)
diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c
index 333ee9ecd33..479ad9209f0 100644
--- a/source/blender/render/intern/pipeline.c
+++ b/source/blender/render/intern/pipeline.c
@@ -2524,7 +2524,7 @@ void RE_RenderAnim(Render *re,
       if (G.is_break == true) {
         /* remove touched file */
         if (is_movie == false && do_write_file) {
-          if ((rd.mode & R_TOUCH)) {
+          if (rd.mode & R_TOUCH) {
             if (!is_multiview_name) {
               if ((BLI_file_size(name) == 0)) {
                 /* BLI_exists(name) is implicit */
diff --git a/source/blender/render/intern/render_result.c b/source/blender/render/intern/render_result.c
index 693cddbebbe..091f5964291 100644
--- a/source/blender/render/intern/render_result.c
+++ b/source/blender/render/intern/render_result.c
@@ -784,7 +784,7 @@ void render_result_views_new(RenderResult *rr, const RenderData *rd)
   render_result_views_free(rr);
 
   /* check renderdata for amount of views */
-  if ((rd->scemode & R_MULTIVIEW)) {
+  if (rd->scemode & R_MULTIVIEW) {
     for (srv = rd->views.first; srv; srv = srv->next) {
       if (BKE_scene_multiview_is_render_view_active(rd, srv) == false) {
         continue;
diff --git a/source/blender/render/intern/texture_pointdensity.c b/source/blender/render/intern/texture_pointdensity.c
index 31d5bf67f28..06dd570ce2c 100644
--- a/source/blender/render/intern/texture_pointdensity.c
+++ b/source/blender/render/intern/texture_pointdensity.c
@@ -494,10 +494,7 @@ static void free_pointdensity(PointDensity *pd)
     pd->point_tree = NULL;
   }
 
-  if (pd->point_data) {
-    MEM_freeN(pd->point_data);
-    pd->point_data = NULL;
-  }
+  MEM_SAFE_FREE(pd->point_data);
   pd->totpoints = 0;
 }
 
diff --git a/source/blender/render/intern/zbuf.c b/source/blender/render/intern/zbuf.c
index 242c8a199fb..726124871ee 100644
--- a/source/blender/render/intern/zbuf.c
+++ b/source/blender/render/intern/zbuf.c
@@ -56,13 +56,8 @@ void zbuf_alloc_span(ZSpan *zspan, int rectx, int recty)
 void zbuf_free_span(ZSpan *zspan)
 {
   if (zspan) {
-    if (zspan->span1) {
-      MEM_freeN(zspan->span1);
-    }
-    if (zspan->span2) {
-      MEM_freeN(zspan->span2);
-    }
-    zspan->span1 = zspan->span2 = NULL;
+    MEM_SAFE_FREE(zspan->span1);
+    MEM_SAFE_FREE(zspan->span2);
   }
 }