[Bf-blender-cvs] [b616bea] GPencil_EditStrokes: Bugfix: Fix for crash after transforming strokes

Joshua Leung noreply at git.blender.org
Sun Sep 28 17:27:01 CEST 2014


Commit: b616bea15cc5bc14bccafd073004f7ac9b406d13
Author: Joshua Leung
Date:   Mon Sep 29 03:22:04 2014 +1300
Branches: GPencil_EditStrokes
https://developer.blender.org/rBb616bea15cc5bc14bccafd073004f7ac9b406d13

Bugfix: Fix for crash after transforming strokes

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

M	source/blender/editors/transform/transform_conversions.c

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

diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 1ad36ed..7fa5588 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -5850,6 +5850,9 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	}
+	else if (t->options & CTX_GPENCIL_STROKES) {
+		/* pass */
+	}
 	else if (t->options & CTX_PAINT_CURVE) {
 		/* pass */
 	}
@@ -7201,7 +7204,6 @@ void flushTransPaintCurve(TransInfo *t)
 
 static void createTransGPencil(bContext *C, TransInfo *t)
 {
-	Object *ob = CTX_data_active_object(C);
 	bGPdata *gpd = ED_gpencil_data_get_active(C);
 	bGPDlayer *gpl;
 	TransData *td = NULL;
@@ -7292,9 +7294,6 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 						copy_m3_m3(td->smtx, smtx);
 						copy_m3_m3(td->mtx, mtx);
 						unit_m3(td->axismtx); // XXX?
-						
-						if (ob && (ob->gpd == gpd))
-							td->ob = ob;
 					}
 				}
 			}




More information about the Bf-blender-cvs mailing list