[Bf-blender-cvs] [eb31c07] soc-2013-paint: Paint Curves:

[Antony Riakiotakis]

Commit: eb31c07b8b0a521bef8c1706c8bf508686b58005
Author: Antony Riakiotakis
Date:   Tue Apr 29 22:33:05 2014 +0300
https://developer.blender.org/rBeb31c07b8b0a521bef8c1706c8bf508686b58005

Paint Curves:

Avoid transform if no curve is active.

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

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 f94e626..2414b65 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -7137,10 +7137,6 @@ void createTransData(bContext *C, TransInfo *t)
                t->flag |= T_TEXTURE;
                createTransTexspace(t);
        }
-       else if (t->options & CTX_PAINT_CURVE) {
-               t->flag |= T_POINTS | T_2D_EDIT;
-               createTransPaintCurveVerts(C, t);
-       }
        else if (t->options & CTX_EDGE) {
                t->ext = NULL;
                t->flag |= T_EDIT;
@@ -7163,6 +7159,9 @@ void createTransData(bContext *C, TransInfo *t)
                                sort_trans_data_dist(t);
                        }
                }
+               else if (t->options & CTX_PAINT_CURVE) {
+                       createTransPaintCurveVerts(C, t);
+               }
                else if (t->obedit) {
                        createTransUVs(C, t);
                        if (t->data && (t->flag & T_PROP_EDIT)) {
@@ -7294,6 +7293,12 @@ void createTransData(bContext *C, TransInfo *t)
                        sort_trans_data_dist(t);
                }
        }
+       else if (ob && (ob->mode & OB_MODE_ALL_PAINT)) {
+               if (t->options & CTX_PAINT_CURVE) {
+                       t->flag |= T_POINTS | T_2D_EDIT;
+                       createTransPaintCurveVerts(C, t);
+               }
+       }
        else {
                createTransObject(C, t);
                t->flag |= T_OBJECT;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs