[Bf-blender-cvs] [40aeab9bc0a] experimental-build: GSOC vertex-paint changes for experimental build Squashed commit of the following:
Howard Trickey
noreply at git.blender.org
Thu Aug 10 17:01:49 CEST 2017
Commit: 40aeab9bc0ada718be5797dfaa340455d662f733
Author: Howard Trickey
Date: Thu Aug 10 10:58:54 2017 -0400
Branches: experimental-build
https://developer.blender.org/rB40aeab9bc0ada718be5797dfaa340455d662f733
GSOC vertex-paint changes for experimental build
Squashed commit of the following:
commit be09594bf962cf24b97c3b616b91d46c42f38a13
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Wed Aug 9 20:22:22 2017 +0530
curve falloff works properly with alpha now
commit a197b716cd2a29ad9e789d1ccb88f65bc1715b23
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Tue Aug 8 21:56:56 2017 +0530
curve fall of works properly now
commit 203ec4c69b4bbd08db6ad98945bb26fcde83643f
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Sun Aug 6 19:17:05 2017 +0530
fixed texture painting brush issue
commit 9e277cd5e1f36c9d3fd156c0a4ac63bdf3cb3c6e
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Thu Aug 3 17:21:20 2017 +0530
vertex selection now works fine with occluded mode
commit 408d26240623b44da0d8532389dc23b07de7e37e
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Wed Aug 2 15:55:32 2017 +0530
new color layor set to default rather tha copying previos one
commit 5f20911a44884c4ab54d846d08df8c36da8ed36d
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Wed Aug 2 12:40:00 2017 +0530
increase the color layer to 64
commit fddd39d718a7cf5552e95be02e34a6ea41b0e9fe
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Wed Jul 26 21:51:45 2017 +0530
subsurface modier changed to consider alpha display in vpaint
commit 90e0c31c72d351d10044bc3579c23497b2fd51ec
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Sat Jul 22 15:41:36 2017 +0530
added the color lock in vertex paint
commit 076b351b2c805d153c242c58fdf61aaffa9338e4
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Thu Jul 20 19:46:12 2017 +0530
now alpha blends same as the rgb colors
commit 4ed7bc28930fc3765be57737936bb4a15f0b9840
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Tue Jul 18 23:41:56 2017 +0530
modified the ply importer to take alpha in vpaint
commit b36f866799f843156e4f1deb86e3a6f1c07f9989
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Tue Jul 18 13:21:22 2017 +0530
removed the traces of printf() which was slowing the painting
commit 986018165b4b32ee382d16ad3e1af5399d76acb7
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Fri Jul 14 14:09:45 2017 +0530
now alpha effect can be seen in 3d view in vpaint
commit fa889d2ad9321213b6a9519830fef46c070b1ab5
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Thu Jul 13 10:31:50 2017 +0530
added alpha support to the collada exporter for vpaint
commit 5acf2e1a95b75da0eccbb94e1fc7e18074341b0c
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Wed Jul 12 12:34:17 2017 +0530
added the addons to script folder, alpha supprt for fbx and oly
commit 97e46b5e1450bdb18b96a61a98fcf7248cd2d9ce
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Sun Jul 9 13:53:15 2017 +0530
added the alpha along with rgb in .ply exporter in vpaint
commit e486461f23d1eacf009a097c890181304428edee
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Sat Jul 8 00:39:24 2017 +0530
added the alpha channel in vpaint a slider and change in ply exporter
commit db3441c8c5c6526162bc850d3514c86e3b27ebdd
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Sat Jul 1 12:29:50 2017 +0530
finalised 1 = white and 0 = black for weight to vertex converter
commit bf6338c48184e528880e48043964ae7b4189ae57
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Fri Jun 30 16:25:08 2017 +0530
added the weight to paint converter as option in paint in verte xpainting and weight in weight painting
commit 1a77b5fe7b68bc17cdbc0ff290018b2409fd211d
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Thu Jun 29 14:34:12 2017 +0530
removed the redundant code
commit 28e4e9b0247e001d10e90f5ed5f3be0866e6e9c6
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Thu Jun 29 14:03:51 2017 +0530
added weight to vertex paint converter
commit 88936370487d2ca83dfd80bd49f931734aa0cf1c
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Tue Jun 27 10:16:33 2017 +0530
fixed a bug for vertex mask selection
commit 444ad728cd4df291bd19b814f390f6977ee3ddb6
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Sat Jun 24 00:33:33 2017 +0530
added non-occluded mode for the weight painting
commit 39a2294d38b0e740dbef47b423b78141d5a6d5a0
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Thu Jun 22 15:55:08 2017 +0530
added the non-occluded mode
commit 72533b087acc69ae1f4fa6ec750ca50979ae278f
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Tue Jun 13 14:04:55 2017 +0530
added vertex mask feature
commit b7532023812b9f3855f74a9da6f3b8986605f3a3
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Sun Jun 11 18:32:04 2017 +0530
added accumulate option
commit a03922f02347a0d16a6580f38fdb7dc76b887f53
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Sat Jun 10 14:13:31 2017 +0530
corrected typo mistake in difference blend mode
commit 3138c32878e5b75fc92a79ef331f046b87e2dd8b
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Sun Jun 4 22:57:59 2017 +0530
added softlight,exclusion,luminocity,saturtion,hue blend modes
commit b72aff483fbe6ce84dab9b5a23f6ca6f0c96988c
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Sat Jun 3 10:21:09 2017 +0530
added Color Dodge, Difference, Screen, Hardlight, Overlay blend modes
commit 29645a58384273512560c6b27eb1c979ea514682
Author: Darshan Kadu <darsh7807 at gmail.com>
Date: Thu Jun 1 14:04:06 2017 +0530
applied patch D2150.id8618.diff and fixed versioning_270.c
===================================================================
D extern/lzo/minilzo/README.LZO
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
A release/scripts/startup/io_mesh_ply_soc/__init__.py
A release/scripts/startup/io_mesh_ply_soc/export_ply_soc.py
A release/scripts/startup/io_mesh_ply_soc/import_ply_soc.py
A release/scripts/startup/io_scene_fbx_soc/__init__.py
A release/scripts/startup/io_scene_fbx_soc/data_types.py
A release/scripts/startup/io_scene_fbx_soc/encode_bin.py
A release/scripts/startup/io_scene_fbx_soc/export_fbx_bin_soc.py
A release/scripts/startup/io_scene_fbx_soc/export_fbx_soc.py
A release/scripts/startup/io_scene_fbx_soc/fbx2json.py
A release/scripts/startup/io_scene_fbx_soc/fbx_utils.py
A release/scripts/startup/io_scene_fbx_soc/import_fbx_soc.py
A release/scripts/startup/io_scene_fbx_soc/json2fbx.py
A 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
deleted file mode 100644
index 83e10e352ff..00000000000
--- a/extern/lzo/minilzo/README.LZO
+++ /dev/null
@@ -1,123 +0,0 @@
-
- ============================================================================
- miniLZO -- mini subset of the LZO real-time data compression library
- ============================================================================
-
- Author : Markus Franz Xaver Johannes Oberhumer
- <markus at 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 02c0f69ac82..762c6b3101d 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':
+ elif mesh.use_paint_mask_vertex and (mode_string == 'PAINT_WEIGHT' or mode_string == 'PAINT_VERTEX'):
layout.menu("VIEW3D_MT_select_paint_mask_vertex")
elif mode_string != 'SCULPT':
layout.menu("VIEW3D_MT_select_%s" % mode_string.lower())
@@ -1779,6 +1779,7 @@ 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()
@@ -1869,6 +1870,7 @@ 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 4026bc972fe..9e5d815acd7 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -51,6 +51,19 @@ 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 ****************
@@ -1134,7 +1147,11 @@ 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)
- self.prop_unified_color(col, context, brush, "color", text="")
+ 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="")
col.separator()
row = col.row(align=True)
@@ -1150,7 +1167,22 @@ 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")
@@ -1717,6 +1749,19 @@ 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"
@@ -1732,6 +1777,7 @@ 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")
@@ -1770,6 +1816,7 @@ 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)
@@ -1779,6 +1826,20 @@ 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
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list