[Bf-blender-cvs] [656fab5ec0e] greasepencil-refactor: GPencil: Simplify brush initialization code

Antonio Vazquez noreply at git.blender.org
Sun Feb 2 22:25:23 CET 2020


Commit: 656fab5ec0ee8bf969078a8eba1cea8d6abf4b82
Author: Antonio Vazquez
Date:   Sun Feb 2 22:25:06 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB656fab5ec0ee8bf969078a8eba1cea8d6abf4b82

GPencil: Simplify brush initialization code

===================================================================

M	source/blender/blenloader/intern/versioning_280.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 27a21556a6b..879a870f411 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -4331,17 +4331,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
       for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) {
         if (brush->gpencil_settings != NULL) {
           brush->gpencil_vertex_tool = brush->gpencil_settings->brush_type;
-        }
-      }
-
-      for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) {
-        if (brush->gpencil_settings != NULL) {
           brush->gpencil_sculpt_tool = brush->gpencil_settings->brush_type;
-        }
-      }
-
-      for (Brush *brush = bmain->brushes.first; brush; brush = brush->id.next) {
-        if (brush->gpencil_settings != NULL) {
           brush->gpencil_weight_tool = brush->gpencil_settings->brush_type;
         }
       }



More information about the Bf-blender-cvs mailing list