[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41751] branches/bmesh/blender: svn merge -r41722:41723 ^/trunk/blender
Campbell Barton
ideasman42 at gmail.com
Fri Nov 11 07:25:46 CET 2011
Revision: 41751
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41751
Author: campbellbarton
Date: 2011-11-11 06:25:45 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
svn merge -r41722:41723 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41722
Modified Paths:
--------------
branches/bmesh/blender/release/datafiles/blender_icons.png
branches/bmesh/blender/release/scripts/startup/bl_ui/__init__.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_common.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_time.py
branches/bmesh/blender/source/blender/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/BKE_bvhutils.h
branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h
branches/bmesh/blender/source/blender/blenkernel/BKE_pointcache.h
branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h
branches/bmesh/blender/source/blender/blenlib/BLI_threads.h
branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c
branches/bmesh/blender/source/blender/blenlib/intern/threads.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/editors/datafiles/blender_icons.png.c
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/include/UI_icons.h
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/physics/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/physics/physics_intern.h
branches/bmesh/blender/source/blender/editors/physics/physics_ops.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_context.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_draw.c
branches/bmesh/blender/source/blender/editors/space_time/space_time.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_force.h
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesdna/intern/makesdna.c
branches/bmesh/blender/source/blender/makesrna/RNA_access.h
branches/bmesh/blender/source/blender/makesrna/RNA_enum_types.h
branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_internal.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object_force.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
branches/bmesh/blender/source/blender/modifiers/CMakeLists.txt
branches/bmesh/blender/source/blender/modifiers/MOD_modifiertypes.h
branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.h
branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_wave.c
branches/bmesh/blender/source/blender/nodes/shader/node_shader_util.c
branches/bmesh/blender/source/blender/nodes/shader/node_shader_util.h
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/bmesh/blender/source/blender/render/extern/include/RE_render_ext.h
branches/bmesh/blender/source/blender/render/extern/include/RE_shader_ext.h
branches/bmesh/blender/source/blender/render/intern/include/pointdensity.h
branches/bmesh/blender/source/blender/render/intern/include/texture.h
branches/bmesh/blender/source/blender/render/intern/include/voxeldata.h
branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
branches/bmesh/blender/source/blender/render/intern/source/pointdensity.c
branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
branches/bmesh/blender/source/blender/render/intern/source/shadeinput.c
branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
branches/bmesh/blender/source/blender/render/intern/source/volumetric.c
branches/bmesh/blender/source/blender/render/intern/source/voxeldata.c
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Added Paths:
-----------
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/bmesh/blender/source/blender/blenkernel/BKE_dynamicpaint.h
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/editors/physics/dynamicpaint_ops.c
branches/bmesh/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_dynamicpaint.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41722
+ /trunk/blender:39992-41723
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-41722
+ /trunk/blender/release:31524-41723
Modified: branches/bmesh/blender/release/datafiles/blender_icons.png
===================================================================
(Binary files differ)
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/__init__.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/__init__.py 2011-11-11 05:52:46 UTC (rev 41750)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/__init__.py 2011-11-11 06:25:45 UTC (rev 41751)
@@ -44,6 +44,7 @@
"properties_particle",
"properties_physics_cloth",
"properties_physics_common",
+ "properties_physics_dynamicpaint",
"properties_physics_field",
"properties_physics_fluid",
"properties_physics_smoke",
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-11-11 05:52:46 UTC (rev 41750)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-11-11 06:25:45 UTC (rev 41751)
@@ -234,6 +234,9 @@
row.prop(md, "mid_level")
row.prop(md, "strength")
+ def DYNAMIC_PAINT(self, layout, ob, md):
+ layout.label(text="Settings can be found inside the Physics context")
+
def EDGE_SPLIT(self, layout, ob, md):
split = layout.split()
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_common.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_common.py 2011-11-11 05:52:46 UTC (rev 41750)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_common.py 2011-11-11 06:25:45 UTC (rev 41751)
@@ -65,6 +65,7 @@
if(ob.type == 'MESH'):
physics_add(self, col, context.collision, "Collision", 'COLLISION', 'MOD_PHYSICS', False)
physics_add(self, col, context.cloth, "Cloth", 'CLOTH', 'MOD_CLOTH', True)
+ physics_add(self, col, context.dynamic_paint, "Dynamic Paint", 'DYNAMIC_PAINT', 'MOD_DYNAMICPAINT', True)
col = split.column()
@@ -106,7 +107,7 @@
layout.label(text=cache.info)
else:
- if cachetype == 'SMOKE':
+ if cachetype in {'SMOKE', 'DYNAMIC_PAINT'}:
if not bpy.data.is_saved:
layout.label(text="Cache is disabled until the file is saved")
layout.enabled = False
@@ -118,17 +119,17 @@
row = layout.row(align=True)
- if cachetype != 'PSYS':
+ if cachetype not in {'PSYS', 'DYNAMIC_PAINT'}:
row.enabled = enabled
row.prop(cache, "frame_start")
row.prop(cache, "frame_end")
- if cachetype not in {'SMOKE', 'CLOTH'}:
+ if cachetype not in {'SMOKE', 'CLOTH', 'DYNAMIC_PAINT'}:
row.prop(cache, "frame_step")
row.prop(cache, "use_quick_cache")
if cachetype != 'SMOKE':
layout.label(text=cache.info)
- if cachetype != 'SMOKE':
+ if cachetype not in {'SMOKE', 'DYNAMIC_PAINT'}:
split = layout.split()
split.enabled = enabled and bpy.data.is_saved
Copied: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py (from rev 41723, trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py)
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py (rev 0)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py 2011-11-11 06:25:45 UTC (rev 41751)
@@ -0,0 +1,497 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+import bpy
+
+from bl_ui.properties_physics_common import (
+ point_cache_ui,
+ effector_weights_ui,
+ )
+
+class PhysicButtonsPanel():
+ bl_space_type = 'PROPERTIES'
+ bl_region_type = 'WINDOW'
+ bl_context = "physics"
+
+ @classmethod
+ def poll(cls, context):
+ ob = context.object
+ rd = context.scene.render
+ return (ob and ob.type == 'MESH') and (not rd.use_game_engine) and (context.dynamic_paint)
+
+
+class PHYSICS_PT_dynamic_paint(PhysicButtonsPanel, bpy.types.Panel):
+ bl_label = "Dynamic Paint"
+
+ def draw(self, context):
+ layout = self.layout
+
+ md = context.dynamic_paint
+ ob = context.object
+
+ if md:
+ layout.prop(md, "ui_type", expand=True)
+
+ if (md.ui_type == "CANVAS"):
+ canvas = md.canvas_settings
+
+ if (not canvas):
+ layout.operator("dpaint.type_toggle", text="Add Canvas").type = 'CANVAS'
+ else:
+ layout.operator("dpaint.type_toggle", text="Remove Canvas", icon='X').type = 'CANVAS'
+
+ surface = canvas.canvas_surfaces.active
+ row = layout.row()
+ row.template_list(canvas, "canvas_surfaces", canvas.canvas_surfaces, "active_index", rows=2)
+
+ col = row.column(align=True)
+ col.operator("dpaint.surface_slot_add", icon='ZOOMIN', text="")
+ col.operator("dpaint.surface_slot_remove", icon='ZOOMOUT', text="")
+
+ if surface:
+ layout.prop(surface, "name")
+ layout.prop(surface, "surface_format", expand=False)
+ col = layout.column()
+
+ if surface.surface_format != "VERTEX":
+ col.label(text="Quality:")
+ col.prop(surface, "image_resolution")
+ col.prop(surface, "use_antialiasing")
+
+ col = layout.column()
+ col.label(text="Frames:")
+ split = col.split()
+
+ col = split.column(align=True)
+ col.prop(surface, "frame_start", text="Start")
+ col.prop(surface, "frame_end", text="End")
+
+ col = split.column()
+ col.prop(surface, "frame_substeps")
+
+ elif (md.ui_type == "BRUSH"):
+ brush = md.brush_settings
+ engine = context.scene.render.engine
+
+ if (not brush):
+ layout.operator("dpaint.type_toggle", text="Add Brush").type = 'BRUSH'
+ else:
+ layout.operator("dpaint.type_toggle", text="Remove Brush", icon='X').type = 'BRUSH'
+
+ split = layout.split()
+
+ col = split.column()
+ col.prop(brush, "absolute_alpha")
+ col.prop(brush, "paint_erase")
+ col.prop(brush, "paint_wetness", text="Wetness")
+
+ col = split.column()
+ if (engine == 'BLENDER_RENDER'):
+ sub = col.column()
+ sub.active = (brush.paint_source != "PARTICLE_SYSTEM");
+ sub.prop(brush, "use_material")
+ if brush.use_material and brush.paint_source != "PARTICLE_SYSTEM" and (engine == 'BLENDER_RENDER'):
+ col.prop(brush, "material", text="")
+ col.prop(brush, "paint_alpha", text="Alpha Factor")
+ else:
+ col.prop(brush, "paint_color", text="")
+ col.prop(brush, "paint_alpha", text="Alpha")
+
+
+class PHYSICS_PT_dp_advanced_canvas(PhysicButtonsPanel, bpy.types.Panel):
+ bl_label = "Dynamic Paint Advanced"
+
+ @classmethod
+ def poll(cls, context):
+ md = context.dynamic_paint
+ return md and (md.ui_type == "CANVAS") and (md.canvas_settings) and (md.canvas_settings.canvas_surfaces.active)
+
+ def draw(self, context):
+ layout = self.layout
+
+ canvas = context.dynamic_paint.canvas_settings
+ surface = canvas.canvas_surfaces.active
+ ob = context.object
+
+ layout.prop(surface, "surface_type", expand=False)
+ layout.separator()
+
+ # dissolve
+ if (surface.surface_type == "PAINT"):
+ split = layout.split(percentage=0.35)
+ col = split.column()
+ col.label(text="Wetmap drying:")
+ col = split.column()
+ split = col.split(percentage=0.7)
+ col = split.column()
+ col.prop(surface, "dry_speed", text="Time")
+ col = split.column()
+ col.prop(surface, "use_dry_log", text="Slow")
+
+ if (surface.surface_type != "WAVE"):
+ split = layout.split(percentage=0.35)
+ col = split.column()
+ if (surface.surface_type == "DISPLACE"):
+ col.prop(surface, "use_dissolve", text="Dissolve:")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list