[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37530] branches/soc-2011-salad: merge with onion -r37529

Ryakiotakis Antonis kalast at gmail.com
Thu Jun 16 00:58:38 CEST 2011


Revision: 37530
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37530
Author:   psy-fi
Date:     2011-06-15 22:58:38 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
merge with onion -r37529

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37529

Modified Paths:
--------------
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-salad/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_paint.h
    branches/soc-2011-salad/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/paint.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-salad/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2011-salad/source/blender/blenlib/intern/pbvh.c
    branches/soc-2011-salad/source/blender/editors/interface/resources.c
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_mask.c
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-salad/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-salad/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2011-salad/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/soc-2011-salad/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-salad/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-salad/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-salad/source/blenderplayer/bad_level_call_stubs/stubs.c

Property Changed:
----------------
    branches/soc-2011-salad/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37387
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37517
/trunk/blender:36834-37527
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37517
/trunk/blender:36834-37527

Modified: branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py	2011-06-15 22:20:04 UTC (rev 37529)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py	2011-06-15 22:58:38 UTC (rev 37530)
@@ -339,7 +339,8 @@
         row.separator()
 
         col = row.column()
-        col.prop(edit, "sculpt_paint_overlay_color", text="Sculpt Overlay Color")
+        col.prop(edit, "sculpt_paint_overlay_color", text="Paint/Sculpt Overlay Color")
+        col.prop(edit, "sculpt_paint_mask_color", text="Default Paint/Sculpt Mask Color")
 
         col.separator()
         col.separator()

Modified: branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-06-15 22:20:04 UTC (rev 37529)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-06-15 22:58:38 UTC (rev 37530)
@@ -533,14 +533,16 @@
                 row.prop(brush, "strength", text="Strength", slider=True)
                 row.prop(brush, "use_pressure_strength", text="")
 
-            if brush.sculpt_tool not in {'MASK', 'SMOOTH'}:
+            #if brush.sculpt_tool not in {'MASK', 'SMOOTH'}:
+            if not brush.mask and brush.sculpt_tool not in {'SMOOTH'}:
                 col.separator()
 
                 row = col.row(align=True)
                 row.prop(brush, "auto_smooth_factor", slider=True)
                 row.prop(brush, "use_inverse_smooth_pressure", toggle=True, text="")
 
-            if brush.sculpt_tool not in ('MASK', 'GRAVITY'):
+            #if brush.sculpt_tool not in ('MASK', 'GRAVITY'):
+            if not brush.mask and brush.sculpt_tool not in ('GRAVITY'):
                 col.separator()
 
                 row = col.row(align=True)
@@ -558,7 +560,8 @@
                 row = col.row(align=True)
                 row.prop(brush, "crease_pinch_factor", slider=True, text="Pinch")
 
-            if brush.sculpt_tool not in {'MASK', 'PINCH', 'INFLATE', 'SMOOTH'}:
+            #if brush.sculpt_tool not in {'MASK', 'PINCH', 'INFLATE', 'SMOOTH'}:
+            if not brush.mask and brush.sculpt_tool not in {'PINCH', 'INFLATE', 'SMOOTH'}:
                 col.separator()
 
                 row = col.row(align=True)
@@ -597,12 +600,17 @@
             col.separator()
             col.row().prop(brush, "direction", expand=True)
 
-            if brush.sculpt_tool in ('DRAW', 'GRAVITY', 'CREASE', 'BLOB', 'INFLATE', 'LAYER', 'CLAY', 'CLAY_STRIP'):
+            #if brush.sculpt_tool in ('DRAW', 'GRAVITY', 'CREASE', 'BLOB', 'INFLATE', 'LAYER', 'CLAY', 'CLAY_STRIP'):
+            if not brush.mask and brush.sculpt_tool in ('DRAW', 'GRAVITY', 'CREASE', 'BLOB', 'INFLATE', 'LAYER', 'CLAY', 'CLAY_STRIP'):
                 col.separator()
 
                 col.prop(brush, "use_accumulate")
 
-            if brush.sculpt_tool not in ('MASK', 'LAYER', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
+            col.separator()
+            col.prop(brush, "mask")
+
+            #if brush.sculpt_tool not in ('MASK', 'LAYER', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
+            if not brush.mask and brush.sculpt_tool not in ('MASK', 'LAYER', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
                 col.separator()
 
                 col.prop(brush, "use_layer", "Layer")
@@ -614,7 +622,8 @@
             if brush.sculpt_tool in ('LAYER'):
                 col.separator()
 
-            if brush.sculpt_tool not in ('MASK', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
+            #if brush.sculpt_tool not in ('MASK', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
+            if not brush.mask and brush.sculpt_tool not in ('MASK', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
                 row = col.row()
                 row.prop(brush, "layer_limit", "Limit")
                 row.active = brush.use_layer
@@ -685,31 +694,43 @@
         # Vertex Paint Mode #
         elif context.vertex_paint_object and brush:
             col = layout.column()
-            col.template_color_wheel(brush, "color", value_slider=True)
-            col.prop(brush, "color", text="")
 
+            if brush.vertex_tool != 'ALPHA':
+                col.template_color_wheel(brush, "color", value_slider=True)
+                col.prop(brush, "color", text="")
+
+            col.separator()
             row = col.row(align=True)
             row.prop(brush, "size", slider=True)
             row.prop(brush, "use_pressure_size", toggle=True, text="")
 
+            col.separator()
             row = col.row(align=True)
             row.prop(brush, "strength", text="Strength", slider=True)
             row.prop(brush, "use_pressure_strength", toggle=True, text="")
 
+            if brush.vertex_tool == 'ALPHA':
+                col.separator()
+                row = col.row(align=True)
+                row.prop(brush, "direction", expand=True)
+
+            col.separator()
+            col.prop(brush, "mask")
+
             # XXX - TODO
+            #col.separator()
             #row = col.row(align=True)
             #row.prop(brush, "jitter", slider=True)
             #row.prop(brush, "use_pressure_jitter", toggle=True, text="")
 
 
-class VIEW3D_PT_tools_masking(PaintPanel, bpy.types.Panel):
+class VIEW3D_PT_tools_select(PaintPanel, bpy.types.Panel):
     bl_label = "Select"
     bl_default_closed = False
 
     @classmethod
     def poll(self, context):
-        settings = self.paint_settings(context)
-        return (settings)
+        return context.sculpt_object or context.vertex_paint_object
 
     def draw(self, context):
         layout = self.layout
@@ -736,6 +757,8 @@
 
             layout.prop(mesh.paint_mask_layers[mesh.active_paint_mask_index], "strength", slider=True)
 
+            layout.prop(mesh.paint_mask_layers[mesh.active_paint_mask_index], "color", text="")
+
         if context.sculpt_object:
             layout.separator()
             col = layout.column(align=True)

Modified: branches/soc-2011-salad/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/BKE_DerivedMesh.h	2011-06-15 22:20:04 UTC (rev 37529)
+++ branches/soc-2011-salad/source/blender/blenkernel/BKE_DerivedMesh.h	2011-06-15 22:58:38 UTC (rev 37530)
@@ -278,6 +278,7 @@
 	 * smooth shaded.
 	 */
 	void (*drawMappedFaces)(DerivedMesh *dm,
+				float (*partial_redraw_planes)[4], int fast, 
 							int (*setDrawOptions)(void *userData, int index,
 												  int *drawSmooth_r),
 							void *userData, int useColors,

Modified: branches/soc-2011-salad/source/blender/blenkernel/BKE_paint.h
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/BKE_paint.h	2011-06-15 22:20:04 UTC (rev 37529)
+++ branches/soc-2011-salad/source/blender/blenkernel/BKE_paint.h	2011-06-15 22:58:38 UTC (rev 37530)
@@ -35,6 +35,9 @@
 #include "DNA_vec_types.h"
 
 struct Brush;
+struct CustomData;
+struct DMGridData;
+struct GridKey;
 struct MFace;
 struct MultireModifierData;
 struct MVert;
@@ -62,8 +65,19 @@
  * however hiding faces is useful */
 int paint_facesel_test(struct Object *ob);
 
+
 void paint_refresh_mask_display(struct Object *ob);
+float paint_mask_from_gridelem(struct DMGridData *elem, struct GridKey *gridkey,
+			       struct CustomData *vdata);
+float paint_mask_from_vertex(struct CustomData *vdata, int vertex_index,
+			     int pmask_totlayer, int pmask_first_layer);
 
+void paint_mask_color_from_gridelem(float *strength, float color[3], struct DMGridData *elem, struct GridKey *gridkey,
+			       struct CustomData *vdata);
+void paint_mask_color_from_vertex(float *strength, float color[3], struct CustomData *vdata, int vertex_index,
+			     int pmask_totlayer, int pmask_first_layer);
+
+
 typedef struct SculptSession {
 	/* Mesh data (not copied) can come either directly from a Mesh, or from a MultiresDM */
 	struct MultiresModifierData *multires; /* Special handling for multires meshes */

Modified: branches/soc-2011-salad/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/intern/DerivedMesh.c	2011-06-15 22:20:04 UTC (rev 37529)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/DerivedMesh.c	2011-06-15 22:58:38 UTC (rev 37530)
@@ -635,9 +635,8 @@
 		func(userData, i, cent, emdm->vertexCos?emdm->faceNos[i]:efa->n);
 	}
 }
-
 /* note, material function is ignored for now. */
-static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), void *userData, int UNUSED(useColors), int (*setMaterial)(int, void *attribs))
+static void emDM_drawMappedFaces(DerivedMesh *dm, float (*partial_redraw_planes)[4], int fast_navigate, int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), void *userData, int UNUSED(useColors), int (*setMaterial)(int, void *attribs))
 {
 	EditMeshDerivedMesh *emdm= (EditMeshDerivedMesh*) dm;
 	EditFace *efa;

Modified: branches/soc-2011-salad/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/intern/brush.c	2011-06-15 22:20:04 UTC (rev 37529)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/brush.c	2011-06-15 22:58:38 UTC (rev 37530)
@@ -366,7 +366,7 @@
 		br->sub_col[0] = 0.25;
 		br->sub_col[1] = 1;
 		break;

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list