fix for one of the [#26854] UV issues
authorCampbell Barton <ideasman42@gmail.com>
Mon, 11 Apr 2011 00:49:08 +0000 (00:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 11 Apr 2011 00:49:08 +0000 (00:49 +0000)
- add back UV X/Y number buttons, the report points out they are missing.
- set the 2D cursor's subtype to PROP_COORDS (so buttons say x/y now)

release/scripts/startup/bl_ui/space_image.py
source/blender/editors/animation/keyframing.c
source/blender/editors/space_image/image_buttons.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_space.c

index 3c2b629684c30fd46029be5bda1047dbaefd084e..f3b78de813cd7379c16357a787ccb7ea644baa14 100644 (file)
@@ -607,7 +607,9 @@ class IMAGE_PT_view_properties(bpy.types.Panel):
         if show_uvedit:
 
             col = layout.column()
-            col.prop(uvedit, "cursor_location")
+            col.label("Cursor Location")
+            row = col.row()
+            row.prop(uvedit, "cursor_location", text="")
 
             col = layout.column()
             col.label(text="UVs:")
index fe461b50a98b2ba7f0ffaeb981c0e6b9e6c4c223..278fa4ccab45ba810c34a1769aec40ebaccaf28e 100644 (file)
@@ -916,7 +916,7 @@ short insert_keyframe (ReportList *reports, ID *id, bAction *act, const char gro
                                /* for Loc/Rot/Scale and also Color F-Curves, the color of the F-Curve in the Graph Editor,
                                 * is determined by the array index for the F-Curve
                                 */
-                               if (ELEM4(RNA_property_subtype(prop), PROP_TRANSLATION, PROP_XYZ, PROP_EULER, PROP_COLOR)) {
+                               if (ELEM5(RNA_property_subtype(prop), PROP_TRANSLATION, PROP_XYZ, PROP_EULER, PROP_COLOR, PROP_COORDS)) {
                                        fcu->color_mode= FCURVE_COLOR_AUTO_RGB;
                                }
                        }
index 6a50de566ac7c69da17fc9f045c6399b95b07d79..3dffb924434518aac74444e2de181184e89821d7 100644 (file)
@@ -255,16 +255,10 @@ static void image_editvertex_buts(const bContext *C, uiBlock *block)
                                ocent[1] *= imy;
                        }
                        
-                       //uiBlockBeginAlign(block);
-                       if(nactive==1) {
-                               uiDefButF(block, NUM, B_TRANS_IMAGE, "Vertex X:",       10, 10, 145, 19, &ocent[0], -10*imx, 10.0*imx, step, digits, "");
-                               uiDefButF(block, NUM, B_TRANS_IMAGE, "Vertex Y:",       165, 10, 145, 19, &ocent[1], -10*imy, 10.0*imy, step, digits, "");
-                       }
-                       else {
-                               uiDefButF(block, NUM, B_TRANS_IMAGE, "Median X:",       10, 10, 145, 19, &ocent[0], -10*imx, 10.0*imx, step, digits, "");
-                               uiDefButF(block, NUM, B_TRANS_IMAGE, "Median Y:",       165, 10, 145, 19, &ocent[1], -10*imy, 10.0*imy, step, digits, "");
-                       }
-                       //uiBlockEndAlign(block);
+                       uiBlockBeginAlign(block);
+                       uiDefButF(block, NUM, B_TRANS_IMAGE, "X:",      10, 10, 145, 19, &ocent[0], -10*imx, 10.0*imx, step, digits, "");
+                       uiDefButF(block, NUM, B_TRANS_IMAGE, "Y:",      165, 10, 145, 19, &ocent[1], -10*imy, 10.0*imy, step, digits, "");
+                       uiBlockEndAlign(block);
                }
        }
        else {  // apply event
@@ -993,16 +987,6 @@ void image_buttons_register(ARegionType *art)
 {
        PanelType *pt;
 
-       /* editvertex_buts not working atm */
-       if(0) {
-               pt= MEM_callocN(sizeof(PanelType), "spacetype image panel uv");
-               strcpy(pt->idname, "IMAGE_PT_uv");
-               strcpy(pt->label, "UV");
-               pt->draw= image_panel_uv;
-               pt->poll= image_panel_uv_poll;
-               BLI_addtail(&art->paneltypes, pt);
-       }
-
        pt= MEM_callocN(sizeof(PanelType), "spacetype image panel curves");
        strcpy(pt->idname, "IMAGE_PT_curves");
        strcpy(pt->label, "Curves");
@@ -1016,6 +1000,13 @@ void image_buttons_register(ARegionType *art)
        strcpy(pt->label, "Grease Pencil");
        pt->draw= gpencil_panel_standard;
        BLI_addtail(&art->paneltypes, pt);
+
+       pt= MEM_callocN(sizeof(PanelType), "spacetype image panel uv");
+       strcpy(pt->idname, "IMAGE_PT_uv");
+       strcpy(pt->label, "UV Vertex");
+       pt->draw= image_panel_uv;
+       pt->poll= image_panel_uv_poll;
+       BLI_addtail(&art->paneltypes, pt);
 }
 
 static int image_properties(bContext *C, wmOperator *UNUSED(op))
index aabb2c9299683ffcd34a31fcd937bc3956514afb..cd9b23da5d3dc7162f01fcb832ba97070aebf5a4 100644 (file)
@@ -766,7 +766,7 @@ char RNA_property_array_item_char(PropertyRNA *prop, int index)
        /* get string to use for array index */
        if ((index < 4) && ELEM(subtype, PROP_QUATERNION, PROP_AXISANGLE))
                return quatitem[index];
-       else if((index < 4) && ELEM7(subtype, PROP_TRANSLATION, PROP_DIRECTION, PROP_XYZ, PROP_XYZ_LENGTH, PROP_EULER, PROP_VELOCITY, PROP_ACCELERATION))
+       else if((index < 4) && ELEM8(subtype, PROP_TRANSLATION, PROP_DIRECTION, PROP_XYZ, PROP_XYZ_LENGTH, PROP_EULER, PROP_VELOCITY, PROP_ACCELERATION, PROP_COORDS))
                return vectoritem[index];
        else if ((index < 4) && ELEM(subtype, PROP_COLOR, PROP_COLOR_GAMMA))
                return coloritem[index];
index c4ab3edc6ec6cbf10a2ee28ebe24ee63480d9b7f..18e4079a0465065f761c0a34962d142f190d7f19 100644 (file)
@@ -902,7 +902,7 @@ static void rna_def_space_image_uv(BlenderRNA *brna)
        RNA_def_property_ui_text(prop, "Normalized Coordinates", "Display UV coordinates from 0.0 to 1.0 rather than in pixels");
        RNA_def_property_update(prop, NC_SPACE|ND_SPACE_IMAGE, NULL);
        
-       prop= RNA_def_property(srna, "cursor_location", PROP_FLOAT, PROP_NONE);
+       prop= RNA_def_property(srna, "cursor_location", PROP_FLOAT, PROP_XYZ);
        RNA_def_property_array(prop, 2);
        RNA_def_property_float_funcs(prop, "rna_SpaceImageEditor_cursor_location_get", "rna_SpaceImageEditor_cursor_location_set", NULL);
        RNA_def_property_ui_text(prop, "2D Cursor Location", "2D cursor location for this view");