[Bf-blender-cvs] [44c74112203] greasepencil-object: Remove unused code

Joshua Leung noreply at git.blender.org
Wed Oct 18 08:16:33 CEST 2017


Commit: 44c74112203dccac97f0131a4e9c59d512161a2c
Author: Joshua Leung
Date:   Wed Oct 18 13:28:54 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB44c74112203dccac97f0131a4e9c59d512161a2c

Remove unused code

Turns out this chunk of code won't get run at all (since GP objects
store the GP datablock on the ob->gpd pointer and not ob->data like
every other object type).

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

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

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a25fa60f264..cb60584da5c 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4888,21 +4888,7 @@ static void lib_link_object(FileData *fd, Main *main)
 			}
 			
 			ob->gpd = newlibadr_us(fd, ob->id.lib, ob->gpd);
-			if (ob->type == OB_GPENCIL) {
-				/* if load a gpencil object must be in object mode except for undo */
-				if ((!fd->memfile) && (ob->data)) {
-					bGPdata *obdata_gp = ob->data;
-					
-					ob->mode &= ~OB_MODE_GPENCIL_EDIT;
-					ob->mode &= ~OB_MODE_GPENCIL_PAINT;
-					ob->mode &= ~OB_MODE_GPENCIL_SCULPT;
-					ob->mode |= OB_MODE_OBJECT;
-					obdata_gp->flag &= ~GP_DATA_STROKE_EDITMODE;
-					obdata_gp->flag &= ~GP_DATA_STROKE_PAINTMODE;
-					obdata_gp->flag &= ~GP_DATA_STROKE_SCULPTMODE;
-					obdata_gp->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
-				}
-			}
+			
 			ob->duplilist = NULL;
 			
 			ob->id.tag &= ~LIB_TAG_NEED_LINK;



More information about the Bf-blender-cvs mailing list