[Bf-blender-cvs] [ef7587c4d56] greasepencil-object: Gpencil: Renamed GPencilSVGWriter into GPencilSVGIterator.

[YimingWu]

Commit: ef7587c4d5677730764d17b4f14f955cb6dc63b0
Author: YimingWu
Date:   Wed Jul 10 09:45:59 2019 +0800
Branches: greasepencil-object
https://developer.blender.org/rBef7587c4d5677730764d17b4f14f955cb6dc63b0

Gpencil: Renamed GPencilSVGWriter into GPencilSVGIterator.

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/blenkernel/intern/writesvg.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 0f771b0f380..ad82c4ce43e 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 0f771b0f380a1ae21d859416043c6119f66e40c9
+Subproject commit ad82c4ce43ef2801ef51e75af1f9702992478b02
diff --git a/release/scripts/addons b/release/scripts/addons
index aa3366b7805..8e6f485cf5b 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit aa3366b7805bbe4d1afee890bda81b6d91bd47be
+Subproject commit 8e6f485cf5b160c425d7da7c743879b20f3d6a96
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 0aa23a4d617..7077ff07384 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 0aa23a4d6177bed4c12392c81d0b767a8b35fe61
+Subproject commit 7077ff07384491d1f7630484995557f1c7302dae
diff --git a/source/blender/blenkernel/intern/writesvg.c b/source/blender/blenkernel/intern/writesvg.c
index 27c5f7e5736..9d934868ad5 100644
--- a/source/blender/blenkernel/intern/writesvg.c
+++ b/source/blender/blenkernel/intern/writesvg.c
@@ -50,25 +50,25 @@ static void write_svg_end(Text* ta){
     BKE_text_write(ta, NULL, "</svg>");
 }
 
-typedef int (svg_get_path_callback)(void* reader, float* fill_rgba, float* stroke_rgba, float* stroke_width);
-typedef int (svg_get_node_callback)(void* reader, float *x, float *y);
+typedef int (svg_get_path_callback)(void* iterator, float* fill_rgba, float* stroke_rgba, float* stroke_width);
+typedef int (svg_get_node_callback)(void* iterator, float *x, float *y);
 
 #define FAC_255_COLOR3(color) ((int)(255*color[0])),((int)(255*color[1])),((int)(255*color[2]))
 
-static void write_paths_from_callback(void* reader, Text* ta, svg_get_path_callback get_path, svg_get_node_callback get_node){
+static void write_paths_from_callback(void* iterator, Text* ta, svg_get_path_callback get_path, svg_get_node_callback get_node){
     int status;
     float fill_color[3], stroke_color[3], stroke_width;
     int fill_color_i[3], stroke_color_i[3];
     float x,y;
     char buf[128];
     int first_in;
-    while(get_path(reader,fill_color,stroke_color,&stroke_width)){
+    while(get_path(iterator,fill_color,stroke_color,&stroke_width)){
 
         /* beginning of a path item */
         BKE_text_write(ta, NULL, "<path d=\"");
         
         first_in = 1;
-        while(get_node(reader,&x,&y)){
+        while(get_node(iterator,&x,&y)){
             sprintf(buf,"%c %f %f\n",first_in?'M':'L',x,y);
             BKE_text_write(ta, NULL, buf);
             first_in = 0;
@@ -84,17 +84,17 @@ static void write_paths_from_callback(void* reader, Text* ta, svg_get_path_callb
     
 }
 
-typedef struct GPencilSVGReader{
+typedef struct GPencilSVGIterator{
     bGPdata* gpd;
     bGPDlayer* layer;
     bGPDframe* frame;
     bGPDstroke* stroke;
     bGPDspoint* point;
     int point_i;
-}GPencilSVGReader;
+}GPencilSVGIterator;
 
-static int svg_gpencil_get_path_callback(GPencilSVGReader* reader, float* fill_color, float* stroke_color, float* stroke_width){
-    GPencilSVGReader* sr = (GPencilSVGReader*)reader;
+static int svg_gpencil_get_path_callback(GPencilSVGIterator* iterator, float* fill_color, float* stroke_color, float* stroke_width){
+    GPencilSVGIterator* sr = (GPencilSVGIterator*)iterator;
     if(!sr->stroke){
         if(!sr->frame->strokes.first){
             return 0;
@@ -114,8 +114,8 @@ static int svg_gpencil_get_path_callback(GPencilSVGReader* reader, float* fill_c
     return 1;
 }
 
-static int svg_gpencil_get_node_callback(GPencilSVGReader* reader, float* x, float* y){
-    GPencilSVGReader* sr = (GPencilSVGReader*)reader;
+static int svg_gpencil_get_node_callback(GPencilSVGIterator* iterator, float* x, float* y){
+    GPencilSVGIterator* sr = (GPencilSVGIterator*)iterator;
     if(!sr->point){
         if(!sr->stroke->points){
             return 0;
@@ -138,8 +138,8 @@ bool BKE_svg_data_from_gpencil(bGPdata* gpd, Text* ta, bGPDlayer* layer, int fra
         return false;
     }
 
-    /* Init temp reader */
-    GPencilSVGReader gsr = {0};
+    /* Init temp iterator */
+    GPencilSVGIterator gsr = {0};
     gsr.gpd = gpd;
     if(layer){
         gsr.layer = layer;
diff --git a/source/tools b/source/tools
index aa9cc18913a..2afbb8ec472 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit aa9cc18913aca559e932d5b7894e3c222ccffae4
+Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685