[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41743] trunk/blender: SVN maintenance.
gsr b3d
gsr.b3d at infernal-iceberg.com
Thu Nov 10 18:43:39 CET 2011
Revision: 41743
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41743
Author: gsrb3d
Date: 2011-11-10 17:43:37 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
SVN maintenance.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
trunk/blender/source/blender/blenkernel/BKE_dynamicpaint.h
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
trunk/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
trunk/blender/source/blender/modifiers/intern/MOD_dynamicpaint.c
Property Changed:
----------------
trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
trunk/blender/source/blender/blenkernel/BKE_dynamicpaint.h
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
trunk/blender/source/blender/makesdna/DNA_dynamicpaint_types.h
trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
trunk/blender/source/blender/modifiers/intern/MOD_dynamicpaint.c
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py 2011-11-10 17:19:12 UTC (rev 41742)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py 2011-11-10 17:43:37 UTC (rev 41743)
@@ -1,497 +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:")
- elif (surface.surface_type == "WEIGHT"):
- col.prop(surface, "use_dissolve", text="Fade:")
- else:
- col.prop(surface, "use_dissolve", text="Dissolve:")
- col = split.column()
- col.active = surface.use_dissolve
- split = col.split(percentage=0.7)
- col = split.column()
- col.prop(surface, "dissolve_speed", text="Time")
- col = split.column()
- col.prop(surface, "use_dissolve_log", text="Slow")
-
- # per type settings
- if (surface.surface_type == "DISPLACE"):
- layout.prop(surface, "use_incremental_displace")
- if (surface.surface_format == "VERTEX"):
- split = layout.split()
- col = split.column()
- col.prop(surface, "depth_clamp")
- col = split.column()
- col.prop(surface, "displace_factor")
-
- if (surface.surface_type == "WAVE"):
- layout.prop(surface, "wave_open_borders")
-
- split = layout.split()
-
- col = split.column(align=True)
- col.prop(surface, "wave_timescale")
- col.prop(surface, "wave_speed")
-
- col = split.column(align=True)
- col.prop(surface, "wave_damping")
- col.prop(surface, "wave_spring")
-
- layout.separator()
- layout.prop(surface, "brush_group", text="Brush Group")
-
-class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, bpy.types.Panel):
- bl_label = "Dynamic Paint Output"
- bl_options = {'DEFAULT_CLOSED'}
-
- @classmethod
- def poll(cls, context):
- md = context.dynamic_paint
- if (not (md and (md.ui_type == "CANVAS") and (md.canvas_settings))):
- return 0
- surface = context.dynamic_paint.canvas_settings.canvas_surfaces.active
- return (surface and not (surface.surface_format=="VERTEX" and (surface.surface_type=="DISPLACE" or surface.surface_type=="WAVE")))
-
- def draw(self, context):
- layout = self.layout
-
- canvas = context.dynamic_paint.canvas_settings
- surface = canvas.canvas_surfaces.active
- ob = context.object
-
- # vertex format outputs
- if (surface.surface_format == "VERTEX"):
- if (surface.surface_type == "PAINT"):
- # toggle active preview
- layout.prop(surface, "preview_id")
-
- # paintmap output
- row = layout.row()
- row.prop_search(surface, "output_name", ob.data, "vertex_colors", text="Paintmap layer: ")
- ic = 'ZOOMIN'
- if (surface.output_exists(object=ob, index=0)):
- ic = 'ZOOMOUT'
- col = row.column(align=True)
- col.operator("dpaint.output_toggle", icon=ic, text="").index = 0
-
- # wetmap output
- row = layout.row()
- row.prop_search(surface, "output_name2", ob.data, "vertex_colors", text="Wetmap layer: ")
- ic = 'ZOOMIN'
- if (surface.output_exists(object=ob, index=1)):
- ic = 'ZOOMOUT'
- col = row.column(align=True)
- col.operator("dpaint.output_toggle", icon=ic, text="").index = 1
- if (surface.surface_type == "WEIGHT"):
- row = layout.row()
- row.prop_search(surface, "output_name", ob, "vertex_groups", text="Vertex Group: ")
- ic = 'ZOOMIN'
- if (surface.output_exists(object=ob, index=0)):
- ic = 'ZOOMOUT'
- col = row.column(align=True)
- col.operator("dpaint.output_toggle", icon=ic, text="").index = 0
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list