Commit: b45349dee14f610242f9d00016d90de2e523b60f
Author: Antonio Vazquez
Date: Wed Feb 28 19:05:10 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb45349dee14f610242f9d00016d90de2e523b60f
More merge fixes
===================================================================
M source/blender/blenkernel/intern/scene.c
===================================================================
diff --git a/source/blender/blenkernel/intern/scene.c
b/source/blender/blenkernel/intern/scene.c
index 396d3478e63..fbbcf44b786 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -227,8 +227,8 @@ void BKE_toolsettings_free(ToolSettings *toolsettings)
curvemapping_free(toolsettings->gp_interpolate.custom_ipo);
}
/* free Grease Pencil multiframe falloff curve */
- if (sce->toolsettings->gp_sculpt.cur_falloff) {
- curvemapping_free(sce->toolsettings->gp_sculpt.cur_falloff);
+ if (toolsettings->gp_sculpt.cur_falloff) {
+ curvemapping_free(toolsettings->gp_sculpt.cur_falloff);
}
MEM_freeN(toolsettings);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
