Commit: b9a6616b479049f7b96b5dbdaf25263fa5210565
Author: Dalai Felinto
Date: Wed Nov 23 11:42:10 2016 +0100
Branches: layers
https://developer.blender.org/rBb9a6616b479049f7b96b5dbdaf25263fa5210565
Fix crash when dupli scene
===================================================================
M source/blender/blenkernel/intern/scene.c
===================================================================
diff --git a/source/blender/blenkernel/intern/scene.c
b/source/blender/blenkernel/intern/scene.c
index 9ea9f32..21a72d1 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -162,18 +162,18 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
Base *base, *obase;
if (type == SCE_COPY_EMPTY) {
- ListBase rl, rv, sl;
+ ListBase rl, rv, scl;
scen = BKE_scene_add(bmain, sce->id.name + 2);
rl = scen->r.layers;
rv = scen->r.views;
- sl = scen->layers;
+ scl = scen->layers;
curvemapping_free_data(&scen->r.mblur_shutter_curve);
scen->r = sce->r;
scen->r.layers = rl;
scen->r.actlay = 0;
scen->r.views = rv;
- scen->layers = sl;
+ scen->layers = scl;
scen->unit = sce->unit;
scen->physics_settings = sce->physics_settings;
scen->gm = sce->gm;
@@ -250,7 +250,7 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
BLI_duplicatelist(&(scen->layers), &(sce->layers));
new_sl = scen->layers.first;
- for (sl = sce->layers.first; sl; sl->next) {
+ for (sl = sce->layers.first; sl; sl = sl->next) {
sl->obedit = NULL;
BLI_duplicatelist(&(new_sl->base), &(sl->base));
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
