Commit: 597cf61e7f0eb298d7b88de84296d9be41057eec
Author: Howard Trickey
Date:   Thu Aug 10 11:01:20 2017 -0400
Branches: experimental-build
https://developer.blender.org/rB597cf61e7f0eb298d7b88de84296d9be41057eec

Revert "GSOC vertex-paint changes for experimental build"

This reverts commit 40aeab9bc0ada718be5797dfaa340455d662f733.

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

A       extern/lzo/minilzo/README.LZO
M       release/scripts/startup/bl_ui/space_view3d.py
M       release/scripts/startup/bl_ui/space_view3d_toolbar.py
D       release/scripts/startup/io_mesh_ply_soc/__init__.py
D       release/scripts/startup/io_mesh_ply_soc/export_ply_soc.py
D       release/scripts/startup/io_mesh_ply_soc/import_ply_soc.py
D       release/scripts/startup/io_scene_fbx_soc/__init__.py
D       release/scripts/startup/io_scene_fbx_soc/data_types.py
D       release/scripts/startup/io_scene_fbx_soc/encode_bin.py
D       release/scripts/startup/io_scene_fbx_soc/export_fbx_bin_soc.py
D       release/scripts/startup/io_scene_fbx_soc/export_fbx_soc.py
D       release/scripts/startup/io_scene_fbx_soc/fbx2json.py
D       release/scripts/startup/io_scene_fbx_soc/fbx_utils.py
D       release/scripts/startup/io_scene_fbx_soc/import_fbx_soc.py
D       release/scripts/startup/io_scene_fbx_soc/json2fbx.py
D       release/scripts/startup/io_scene_fbx_soc/parse_fbx.py
M       source/blender/blenkernel/BKE_paint.h
M       source/blender/blenkernel/BKE_pbvh.h
M       source/blender/blenkernel/intern/CCGSubSurf.c
M       source/blender/blenkernel/intern/DerivedMesh.c
M       source/blender/blenkernel/intern/cdderivedmesh.c
M       source/blender/blenkernel/intern/object.c
M       source/blender/blenkernel/intern/paint.c
M       source/blender/blenkernel/intern/pbvh.c
M       source/blender/blenkernel/intern/pbvh_intern.h
M       source/blender/blenkernel/intern/subsurf_ccg.c
M       source/blender/blenloader/intern/versioning_270.c
M       source/blender/blenloader/intern/versioning_defaults.c
M       source/blender/collada/GeometryExporter.cpp
M       source/blender/editors/mesh/mesh_data.c
M       source/blender/editors/sculpt_paint/paint_image.c
M       source/blender/editors/sculpt_paint/paint_intern.h
M       source/blender/editors/sculpt_paint/paint_ops.c
M       source/blender/editors/sculpt_paint/paint_vertex.c
M       source/blender/editors/sculpt_paint/sculpt.c
M       source/blender/editors/sculpt_paint/sculpt_intern.h
M       source/blender/editors/space_view3d/drawobject.c
M       source/blender/editors/space_view3d/view3d_header.c
M       source/blender/gpu/intern/gpu_buffers.c
M       source/blender/makesdna/DNA_brush_types.h
M       source/blender/makesdna/DNA_customdata_types.h
M       source/blender/makesdna/DNA_object_types.h
M       source/blender/makesdna/DNA_scene_types.h
M       source/blender/makesrna/intern/rna_brush.c
M       source/blender/makesrna/intern/rna_mesh.c
M       source/blender/makesrna/intern/rna_sculpt_paint.c
M       source/blender/render/extern/include/RE_shader_ext.h

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

diff --git a/extern/lzo/minilzo/README.LZO b/extern/lzo/minilzo/README.LZO
new file mode 100644
index 00000000000..83e10e352ff
--- /dev/null
+++ b/extern/lzo/minilzo/README.LZO
@@ -0,0 +1,123 @@
+
+ ============================================================================
+ miniLZO -- mini subset of the LZO real-time data compression library
+ ============================================================================
+
+ Author  : Markus Franz Xaver Johannes Oberhumer
+           <mar...@oberhumer.com>
+           http://www.oberhumer.com/opensource/lzo/
+ Version : 2.08
+ Date    : 29 Jun 2014
+
+ I've created miniLZO for projects where it is inconvenient to
+ include (or require) the full LZO source code just because you
+ want to add a little bit of data compression to your application.
+
+ miniLZO implements the LZO1X-1 compressor and both the standard and
+ safe LZO1X decompressor. Apart from fast compression it also useful
+ for situations where you want to use pre-compressed data files (which
+ must have been compressed with LZO1X-999).
+
+ miniLZO consists of one C source file and three header files:
+    minilzo.c
+    minilzo.h, lzoconf.h, lzodefs.h
+
+ To use miniLZO just copy these files into your source directory, add
+ minilzo.c to your Makefile and #include minilzo.h from your program.
+ Note: you also must distribute this file ('README.LZO') with your project.
+
+ minilzo.o compiles to about 6 KiB (using gcc or Visual C on an i386), and
+ the sources are about 30 KiB when packed with zip - so there's no more
+ excuse that your application doesn't support data compression :-)
+
+ For more information, documentation, example programs and other support
+ files (like Makefiles and build scripts) please download the full LZO
+ package from
+    http://www.oberhumer.com/opensource/lzo/
+
+ Have fun,
+  Markus
+
+
+ P.S. minilzo.c is generated automatically from the LZO sources and
+      therefore functionality is completely identical
+
+
+ Appendix A: building miniLZO
+ ----------------------------
+ miniLZO is written such a way that it should compile and run
+ out-of-the-box on most machines.
+
+ If you are running on a very unusual architecture and lzo_init() fails then
+ you should first recompile with '-DLZO_DEBUG' to see what causes the failure.
+ The most probable case is something like 'sizeof(void *) != sizeof(size_t)'.
+ After identifying the problem you can compile by adding some defines
+ like '-DSIZEOF_VOID_P=8' to your Makefile.
+
+ The best solution is (of course) using Autoconf - if your project uses
+ Autoconf anyway just add '-DMINILZO_HAVE_CONFIG_H' to your compiler
+ flags when compiling minilzo.c. See the LZO distribution for an example
+ how to set up configure.ac.
+
+
+ Appendix B: list of public functions available in miniLZO
+ ---------------------------------------------------------
+ Library initialization
+    lzo_init()
+
+ Compression
+    lzo1x_1_compress()
+
+ Decompression
+    lzo1x_decompress()
+    lzo1x_decompress_safe()
+
+ Checksum functions
+    lzo_adler32()
+
+ Version functions
+    lzo_version()
+    lzo_version_string()
+    lzo_version_date()
+
+ Portable (but slow) string functions
+    lzo_memcmp()
+    lzo_memcpy()
+    lzo_memmove()
+    lzo_memset()
+
+
+ Appendix C: suggested macros for 'configure.ac' when using Autoconf
+ -------------------------------------------------------------------
+ Checks for typedefs and structures
+    AC_CHECK_TYPE(ptrdiff_t,long)
+    AC_TYPE_SIZE_T
+    AC_CHECK_SIZEOF(short)
+    AC_CHECK_SIZEOF(int)
+    AC_CHECK_SIZEOF(long)
+    AC_CHECK_SIZEOF(long long)
+    AC_CHECK_SIZEOF(__int64)
+    AC_CHECK_SIZEOF(void *)
+    AC_CHECK_SIZEOF(size_t)
+    AC_CHECK_SIZEOF(ptrdiff_t)
+
+ Checks for compiler characteristics
+    AC_C_CONST
+
+ Checks for library functions
+    AC_CHECK_FUNCS(memcmp memcpy memmove memset)
+
+
+ Appendix D: Copyright
+ ---------------------
+ LZO and miniLZO are Copyright (C) 1996-2014 Markus Franz Xaver Oberhumer
+ All Rights Reserved.
+
+ LZO and miniLZO are distributed under the terms of the GNU General
+ Public License (GPL).  See the file COPYING.
+
+ Special licenses for commercial and other applications which
+ are not willing to accept the GNU General Public License
+ are available by contacting the author.
+
+
diff --git a/release/scripts/startup/bl_ui/space_view3d.py 
b/release/scripts/startup/bl_ui/space_view3d.py
index 762c6b3101d..02c0f69ac82 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -170,7 +170,7 @@ class VIEW3D_MT_editor_menus(Menu):
             mesh = obj.data
             if mesh.use_paint_mask:
                 layout.menu("VIEW3D_MT_select_paint_mask")
-            elif mesh.use_paint_mask_vertex and (mode_string == 'PAINT_WEIGHT' 
or mode_string == 'PAINT_VERTEX'):
+            elif mesh.use_paint_mask_vertex and mode_string == 'PAINT_WEIGHT':
                 layout.menu("VIEW3D_MT_select_paint_mask_vertex")
         elif mode_string != 'SCULPT':
             layout.menu("VIEW3D_MT_select_%s" % mode_string.lower())
@@ -1779,7 +1779,6 @@ class VIEW3D_MT_paint_vertex(Menu):
         layout.operator("paint.vertex_color_set")
         layout.operator("paint.vertex_color_smooth")
         layout.operator("paint.vertex_color_dirt")
-        layout.operator("paint.weight_to_vertex_convert")
 
         layout.separator()
 
@@ -1870,7 +1869,6 @@ class VIEW3D_MT_paint_weight(Menu):
         layout.separator()
 
         layout.operator("paint.weight_set")
-        layout.operator("paint.weight_to_vertex_convert")
 
 
 # ********** Sculpt menu **********
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py 
b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 9e5d815acd7..4026bc972fe 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -51,19 +51,6 @@ def draw_keyframing_tools(context, layout):
     row.operator("anim.keyframe_delete_v3d", text="Remove")
 
 
-# Used by vertex & weight paint
-def draw_vpaint_symmetry(layout, vpaint):
-    col = layout.column(align=True)
-    col.label(text="Mirror:")
-    row = col.row(align=True)
-
-    row.prop(vpaint, "use_symmetry_x", text="X", toggle=True)
-    row.prop(vpaint, "use_symmetry_y", text="Y", toggle=True)
-    row.prop(vpaint, "use_symmetry_z", text="Z", toggle=True)
-
-    col = layout.column()
-    col.prop(vpaint, "radial_symmetry", text="Radial")
-
 # ********** default tools for object-mode ****************
 
 
@@ -1147,11 +1134,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
             self.prop_unified_color_picker(col, context, brush, "color", 
value_slider=True)
             if settings.palette:
                 col.template_palette(settings, "palette", color=True)
-            row = col.row(align=True)
-            self.prop_unified_color(row, context, brush, "color", text="")
-            self.prop_unified_color(row, context, brush, "secondary_color", 
text="")
-            row.separator()
-            row.operator("paint.brush_colors_flip", icon='FILE_REFRESH', 
text="")
+            self.prop_unified_color(col, context, brush, "color", text="")
 
             col.separator()
             row = col.row(align=True)
@@ -1167,22 +1150,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
             # row.prop(brush, "jitter", slider=True)
             # row.prop(brush, "use_pressure_jitter", toggle=True, text="")
             col.separator()
-            #color lock
-            col.label(text="Lock Color:")
-            row= col.row(align= True)
-            toolsettings = context.tool_settings
-            vpaint = toolsettings.vertex_paint
-            row.prop(vpaint,"color_lock_r",text="R",toggle= True)
-            row.prop(vpaint,"color_lock_g",text="G",toggle= True)
-            row.prop(vpaint,"color_lock_b",text="B",toggle= True)
-            row.prop(vpaint,"color_lock_a",text="A",toggle= True)
-            col.separator()
             col.prop(brush, "vertex_tool", text="Blend")
-            col.prop(brush,"use_accumulate")
-            col.prop(brush,"use_alpha_vpaint")
-            sub = col.column()
-            sub.active = brush.use_alpha_vpaint
-            sub.prop(brush, "alpha_vpaint", text="Alpha", slider=True)
 
             col.separator()
             col.template_ID(settings, "palette", new="palette.new")
@@ -1749,19 +1717,6 @@ class VIEW3D_PT_tools_weightpaint(View3DPanel, Panel):
         props.data_type = 'VGROUP_WEIGHTS'
 
 
-class VIEW3D_PT_tools_weightpaint_symmetry(Panel, View3DPaintPanel):
-    bl_category = "Tools"
-    bl_context = "weightpaint"
-    bl_options = {'DEFAULT_CLOSED'}
-    bl_label = "Symmetry"
-
-    def draw(self, context):
-        layout = self.layout
-        toolsettings = context.tool_settings
-        wpaint = toolsettings.weight_paint
-        draw_vpaint_symmetry(layout, wpaint)
-
-
 class VIEW3D_PT_tools_weightpaint_options(Panel, View3DPaintPanel):
     bl_category = "Options"
     bl_context = "weightpaint"
@@ -1777,7 +1732,6 @@ class VIEW3D_PT_tools_weightpaint_options(Panel, 
View3DPaintPanel):
         row = col.row()
 
         row.prop(wpaint, "use_normal")
-        row.prop(wpaint, "use_occlude")
         col = layout.column()
         row = col.row()
         row.prop(wpaint, "use_spray")
@@ -1816,7 +1770,6 @@ class VIEW3D_PT_tools_vertexpaint(Panel, 
View3DPaintPanel):
         # col.prop(vpaint, "mode", text="")
         row.prop(vpaint, "use_normal")
         col.prop(vpaint, "use_spray")
-        col.prop(vpaint, "use_occlude")
 
         self.unified_paint_settings(col, context)
 
@@ -1826,20 +1779,6 @@ class VIEW3D_PT_tools_vertexpaint(Panel, 
View3DPaintPanel):
 #~         col.label(text="Multiply:")
 #~         col.prop(vpaint, "mul", text="")
 
-
-class VIEW3D_PT_tools_vertexpaint_symmetry(Panel, View3DPaintPanel):
-    bl_category = "Tools"
-    bl_context = "vertexpaint"
-    bl_options = {'DEFAULT_CLOSED'}
-    bl_label = "Symmetry"
-
-    def draw(self, context):
-        layout = self.layout
-        toolsettings = context.tool_settings
-        vpaint = toolsettings.vertex_paint
-        dr

@@ Diff output truncated at 10240 characters. @@

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

Reply via email to