diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-05-15 08:51:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-15 08:51:54 +0300 |
commit | 0d65dda14706e9338c6906b8ed81fca2cb027e34 (patch) | |
tree | 7693687f8ff90f45ea72085f2904cb866870e799 /source/blender/makesrna | |
parent | 77a90f7666bf6eb78b8f22ab4abae300aae10ef9 (diff) | |
parent | b5b72a3f2971094860558969e255b3ee7d7ed989 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 4603a0d17b5..5fe91386bd5 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1753,7 +1753,7 @@ static void rna_SceneRenderLayer_pass_update(Main *bmain, Scene *activescene, Po static void rna_SceneRenderLayer_update_render_passes(ID *id) { - Scene *scene = (Scene*) id; + Scene *scene = (Scene *)id; if (scene->nodetree) ntreeCompositUpdateRLayers(scene->nodetree); } |