From 117fdd8072fb6b8390d85498d8185c55a81f40e8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 26 Jul 2009 03:54:17 +0000 Subject: [PATCH] * projection paint options in the toolbar * renamed __no_header__ -> __show_header__ --- release/ui/buttons_data_armature.py | 2 +- release/ui/buttons_data_bone.py | 2 +- release/ui/buttons_data_camera.py | 2 +- release/ui/buttons_data_curve.py | 2 +- release/ui/buttons_data_lamp.py | 2 +- release/ui/buttons_data_lattice.py | 2 +- release/ui/buttons_data_mesh.py | 2 +- release/ui/buttons_data_text.py | 2 +- release/ui/buttons_game.py | 2 +- release/ui/buttons_material.py | 2 +- release/ui/buttons_object.py | 2 +- release/ui/buttons_particle.py | 2 +- release/ui/buttons_texture.py | 2 +- release/ui/buttons_world.py | 2 +- release/ui/space_info.py | 14 +++++++------- release/ui/space_view3d_toolbar.py | 15 +++++++++++++-- .../blender/makesrna/intern/rna_sculpt_paint.c | 16 ++++++++-------- source/blender/makesrna/intern/rna_ui.c | 4 ++-- 18 files changed, 44 insertions(+), 33 deletions(-) diff --git a/release/ui/buttons_data_armature.py b/release/ui/buttons_data_armature.py index ad34d867350..b2c135e4a9b 100644 --- a/release/ui/buttons_data_armature.py +++ b/release/ui/buttons_data_armature.py @@ -11,7 +11,7 @@ class DataButtonsPanel(bpy.types.Panel): class DATA_PT_context_arm(DataButtonsPanel): __idname__ = "DATA_PT_context_arm" - __no_header__ = True + __show_header__ = False def draw(self, context): layout = self.layout diff --git a/release/ui/buttons_data_bone.py b/release/ui/buttons_data_bone.py index b31cac15425..4458f8d2d94 100644 --- a/release/ui/buttons_data_bone.py +++ b/release/ui/buttons_data_bone.py @@ -11,7 +11,7 @@ class BoneButtonsPanel(bpy.types.Panel): class BONE_PT_context_bone(BoneButtonsPanel): __idname__ = "BONE_PT_context_bone" - __no_header__ = True + __show_header__ = False def draw(self, context): layout = self.layout diff --git a/release/ui/buttons_data_camera.py b/release/ui/buttons_data_camera.py index 7ca70029e49..9f7a11a980c 100644 --- a/release/ui/buttons_data_camera.py +++ b/release/ui/buttons_data_camera.py @@ -11,7 +11,7 @@ class DataButtonsPanel(bpy.types.Panel): class DATA_PT_context_camera(DataButtonsPanel): __idname__ = "DATA_PT_context_camera" - __no_header__ = True + __show_header__ = False def draw(self, context): layout = self.layout diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py index 04c4cd6d01e..caaab7b21fc 100644 --- a/release/ui/buttons_data_curve.py +++ b/release/ui/buttons_data_curve.py @@ -11,7 +11,7 @@ class DataButtonsPanel(bpy.types.Panel): class DATA_PT_context_curve(DataButtonsPanel): __idname__ = "DATA_PT_context_curve" - __no_header__ = True + __show_header__ = False def draw(self, context): layout = self.layout diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py index 018650cf8bf..aa84c5c471d 100644 --- a/release/ui/buttons_data_lamp.py +++ b/release/ui/buttons_data_lamp.py @@ -21,7 +21,7 @@ class DATA_PT_preview(DataButtonsPanel): class DATA_PT_context_lamp(DataButtonsPanel): __idname__ = "DATA_PT_context_lamp" - __no_header__ = True + __show_header__ = False def draw(self, context): layout = self.layout diff --git a/release/ui/buttons_data_lattice.py b/release/ui/buttons_data_lattice.py index 1bcaa342c67..57713749b0c 100644 --- a/release/ui/buttons_data_lattice.py +++ b/release/ui/buttons_data_lattice.py @@ -11,7 +11,7 @@ class DataButtonsPanel(bpy.types.Panel): class DATA_PT_context_lattice(DataButtonsPanel): __idname__ = "DATA_PT_context_lattice" - __no_header__ = True + __show_header__ = False def draw(self, context): layout = self.layout diff --git a/release/ui/buttons_data_mesh.py b/release/ui/buttons_data_mesh.py index d4bf9698a89..ed4c50aaf1a 100644 --- a/release/ui/buttons_data_mesh.py +++ b/release/ui/buttons_data_mesh.py @@ -11,7 +11,7 @@ class DataButtonsPanel(bpy.types.Panel): class DATA_PT_context_mesh(DataButtonsPanel): __idname__ = "DATA_PT_context_mesh" - __no_header__ = True + __show_header__ = False def draw(self, context): layout = self.layout diff --git a/release/ui/buttons_data_text.py b/release/ui/buttons_data_text.py index 81d54af0ef7..84abe554f5c 100644 --- a/release/ui/buttons_data_text.py +++ b/release/ui/buttons_data_text.py @@ -11,7 +11,7 @@ class DataButtonsPanel(bpy.types.Panel): class DATA_PT_context_text(DataButtonsPanel): __idname__ = "DATA_PT_context_text" - __no_header__ = True + __show_header__ = False def draw(self, context): layout = self.layout diff --git a/release/ui/buttons_game.py b/release/ui/buttons_game.py index 1a0f6666a47..c2bba62fc27 100644 --- a/release/ui/buttons_game.py +++ b/release/ui/buttons_game.py @@ -205,7 +205,7 @@ class WorldButtonsPanel(bpy.types.Panel): return (rd.engine == 'BLENDER_GAME') class WORLD_PT_game_context_world(WorldButtonsPanel): - __no_header__ = True + __show_header__ = False def poll(self, context): rd = context.scene.render_data diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py index 9a28a74d0f7..30f7f7122dc 100644 --- a/release/ui/buttons_material.py +++ b/release/ui/buttons_material.py @@ -21,7 +21,7 @@ class MATERIAL_PT_preview(MaterialButtonsPanel): class MATERIAL_PT_context_material(MaterialButtonsPanel): __idname__= "MATERIAL_PT_context_material" - __no_header__ = True + __show_header__ = False def poll(self, context): return (context.object) diff --git a/release/ui/buttons_object.py b/release/ui/buttons_object.py index 8caeaacf5c1..9ab28241e5d 100644 --- a/release/ui/buttons_object.py +++ b/release/ui/buttons_object.py @@ -8,7 +8,7 @@ class ObjectButtonsPanel(bpy.types.Panel): class OBJECT_PT_context_object(ObjectButtonsPanel): __idname__ = "OBJECT_PT_context_object" - __no_header__ = True + __show_header__ = False def draw(self, context): layout = self.layout diff --git a/release/ui/buttons_particle.py b/release/ui/buttons_particle.py index f74dfa06427..46d7a7999f4 100644 --- a/release/ui/buttons_particle.py +++ b/release/ui/buttons_particle.py @@ -20,7 +20,7 @@ class ParticleButtonsPanel(bpy.types.Panel): class PARTICLE_PT_particles(ParticleButtonsPanel): __idname__= "PARTICLE_PT_particles" - __no_header__ = True + __show_header__ = False def poll(self, context): return (context.particle_system or context.object) diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py index 80ae503ee6a..df409d3c524 100644 --- a/release/ui/buttons_texture.py +++ b/release/ui/buttons_texture.py @@ -34,7 +34,7 @@ class TEXTURE_PT_preview(TextureButtonsPanel): class TEXTURE_PT_context_texture(TextureButtonsPanel): __idname__= "TEXTURE_PT_context_texture" - __no_header__ = True + __show_header__ = False def poll(self, context): return (context.material or context.world or context.lamp or context.brush or context.texture) diff --git a/release/ui/buttons_world.py b/release/ui/buttons_world.py index e0305bbaf04..67cf5cc2e89 100644 --- a/release/ui/buttons_world.py +++ b/release/ui/buttons_world.py @@ -20,7 +20,7 @@ class WORLD_PT_preview(WorldButtonsPanel): layout.template_preview(world) class WORLD_PT_context_world(WorldButtonsPanel): - __no_header__ = True + __show_header__ = False def poll(self, context): rd = context.scene.render_data diff --git a/release/ui/space_info.py b/release/ui/space_info.py index 9d72aa7c5e9..365bcada6b9 100644 --- a/release/ui/space_info.py +++ b/release/ui/space_info.py @@ -171,7 +171,7 @@ class INFO_MT_help(bpy.types.Menu): class INFO_PT_tabs(bpy.types.Panel): __space_type__ = "USER_PREFERENCES" - __no_header__ = True + __show_header__ = False def draw(self, context): layout = self.layout @@ -182,7 +182,7 @@ class INFO_PT_tabs(bpy.types.Panel): class INFO_PT_view(bpy.types.Panel): __space_type__ = "USER_PREFERENCES" __label__ = "View" - __no_header__ = True + __show_header__ = False def poll(self, context): userpref = context.user_preferences @@ -287,7 +287,7 @@ class INFO_PT_view(bpy.types.Panel): class INFO_PT_edit(bpy.types.Panel): __space_type__ = "USER_PREFERENCES" __label__ = "Edit" - __no_header__ = True + __show_header__ = False def poll(self, context): userpref = context.user_preferences @@ -385,7 +385,7 @@ class INFO_PT_edit(bpy.types.Panel): class INFO_PT_system(bpy.types.Panel): __space_type__ = "USER_PREFERENCES" __label__ = "System" - __no_header__ = True + __show_header__ = False def poll(self, context): userpref = context.user_preferences @@ -451,7 +451,7 @@ class INFO_PT_system(bpy.types.Panel): class INFO_PT_filepaths(bpy.types.Panel): __space_type__ = "USER_PREFERENCES" __label__ = "File Paths" - __no_header__ = True + __show_header__ = False def poll(self, context): userpref = context.user_preferences @@ -510,7 +510,7 @@ class INFO_PT_filepaths(bpy.types.Panel): class INFO_PT_language(bpy.types.Panel): __space_type__ = "USER_PREFERENCES" __label__ = "Language" - __no_header__ = True + __show_header__ = False def poll(self, context): userpref = context.user_preferences @@ -533,7 +533,7 @@ class INFO_PT_language(bpy.types.Panel): class INFO_PT_bottombar(bpy.types.Panel): __space_type__ = "USER_PREFERENCES" __label__ = " " - __no_header__ = True + __show_header__ = False def draw(self, context): layout = self.layout diff --git a/release/ui/space_view3d_toolbar.py b/release/ui/space_view3d_toolbar.py index af298e6e27b..acc2590132e 100644 --- a/release/ui/space_view3d_toolbar.py +++ b/release/ui/space_view3d_toolbar.py @@ -486,8 +486,19 @@ class VIEW3D_PT_tools_texture_paint(View3DPanel): def draw(self, context): layout = self.layout - - layout.itemL(text="Nothing yet") + ipaint = context.tool_settings.image_paint + + col = layout.column() + col.itemR(ipaint, "use_projection") + col.itemR(ipaint, "use_occlude") + col.itemR(ipaint, "use_backface_cull") + col.itemR(ipaint, "use_normal_falloff") + col.itemR(ipaint, "invert_stencil") + col.itemR(ipaint, "use_clone_layer") + col.itemR(ipaint, "use_stencil_layer") + + col.itemR(ipaint, "seam_bleed") + col.itemR(ipaint, "normal_angle") # ********** default tools for particle mode **************** diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index df40663fa02..1e512d8f9bb 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -185,25 +185,25 @@ static void rna_def_image_paint(BlenderRNA *brna) RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_DISABLE); RNA_def_property_ui_text(prop, "Project Paint", "Use projection painting for improved consistency in the brush strokes."); - prop= RNA_def_property(srna, "occlude", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_XRAY); + prop= RNA_def_property(srna, "use_occlude", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_XRAY); RNA_def_property_ui_text(prop, "Occlude", "Only paint onto the faces directly under the brush (slower)"); - prop= RNA_def_property(srna, "cull", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_BACKFACE); + prop= RNA_def_property(srna, "use_backface_cull", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_BACKFACE); RNA_def_property_ui_text(prop, "Cull", "Ignore faces pointing away from the view (faster)"); - prop= RNA_def_property(srna, "use_normal", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_FLAT); + prop= RNA_def_property(srna, "use_normal_falloff", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_FLAT); RNA_def_property_ui_text(prop, "Normal", "Paint most on faces pointing towards the view"); prop= RNA_def_property(srna, "use_stencil_layer", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_LAYER_MASK); RNA_def_property_ui_text(prop, "Stencil Layer", "Set the mask layer from the UV layer buttons"); - prop= RNA_def_property(srna, "invert_mask", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "invert_stencil", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_LAYER_MASK_INV); - RNA_def_property_ui_text(prop, "Invert", "Invert the mask"); + RNA_def_property_ui_text(prop, "Invert", "Invert the stencil layer"); prop= RNA_def_property(srna, "use_clone_layer", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", IMAGEPAINT_PROJECT_LAYER_CLONE); diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index 21bacc76a8c..c3655ab2542 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -647,8 +647,8 @@ static void rna_def_panel(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "type->flag", PNL_DEFAULT_CLOSED); RNA_def_property_flag(prop, PROP_REGISTER); - prop= RNA_def_property(srna, "no_header", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "type->flag", PNL_NO_HEADER); + prop= RNA_def_property(srna, "show_header", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "type->flag", PNL_NO_HEADER); RNA_def_property_flag(prop, PROP_REGISTER); }