* projection paint options in the toolbar
authorCampbell Barton <ideasman42@gmail.com>
Sun, 26 Jul 2009 03:54:17 +0000 (03:54 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 26 Jul 2009 03:54:17 +0000 (03:54 +0000)
* renamed  __no_header__ -> __show_header__

18 files changed:
release/ui/buttons_data_armature.py
release/ui/buttons_data_bone.py
release/ui/buttons_data_camera.py
release/ui/buttons_data_curve.py
release/ui/buttons_data_lamp.py
release/ui/buttons_data_lattice.py
release/ui/buttons_data_mesh.py
release/ui/buttons_data_text.py
release/ui/buttons_game.py
release/ui/buttons_material.py
release/ui/buttons_object.py
release/ui/buttons_particle.py
release/ui/buttons_texture.py
release/ui/buttons_world.py
release/ui/space_info.py
release/ui/space_view3d_toolbar.py
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_ui.c

index ad34d8673500176cf0a0d6810dafcebda95edca2..b2c135e4a9bbb20745bb38aa6fb645d907196ab8 100644 (file)
@@ -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
index b31cac15425b2d475f38bad785604246159505ab..4458f8d2d945f15a5d222837e313212cf533029f 100644 (file)
@@ -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
index 7ca70029e490947c35569ff53ec74555a089656b..9f7a11a980c21efac07014a12947294b25d26477 100644 (file)
@@ -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
index 04c4cd6d01ec933fb2dded905fca3a9035f9390d..caaab7b21fc7e2efeda6f5262f12fcafbf69f67b 100644 (file)
@@ -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
index 018650cf8bf18d706c1e97f58eab153060d73489..aa84c5c471d59be76cfba5aac07a47049d024ea7 100644 (file)
@@ -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
index 1bcaa342c67461d5389dee0ff0134a99fcf88108..57713749b0c2c3ab960b0959bfe46750ee6cfec9 100644 (file)
@@ -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
index d4bf9698a895d3d9326286df17ae350a857af94f..ed4c50aaf1a9f8165d8b9423cc506ea355bf9b28 100644 (file)
@@ -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
index 81d54af0ef7636cd151affbe83513a3400c64f58..84abe554f5c7849de802aab2209aedf126ab262e 100644 (file)
@@ -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
index 1a0f6666a479f45ca3f0e25bd0e5b7278dcf8e63..c2bba62fc27ac3f48f17a5f6ca3200690b8eb8eb 100644 (file)
@@ -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
index 9a28a74d0f785ecbef1fb995b373da0353a7b9f4..30f7f7122dc158ffda70c6c4da0433e8d7c0fe8d 100644 (file)
@@ -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)
index 8caeaacf5c1e468130401d34409176f043a27846..9ab28241e5d3e4cf9b5d6cf197da823bd8025ff2 100644 (file)
@@ -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
index f74dfa06427628daf7821ab17ada6e90035dbe7e..46d7a7999f43822c8bd9fa9b2c28f345545f862e 100644 (file)
@@ -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)
index 80ae503ee6a086031f30bdbb1f10110d6df75276..df409d3c524c0abd72203a6bc77bec2a79988a1f 100644 (file)
@@ -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)
index e0305bbaf0424829235d68ebbc7790f7294f1a96..67cf5cc2e89515dbe0d35509dd15564b1fc039cb 100644 (file)
@@ -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
index 9d72aa7c5e91f103da6954de5302a02766f7fba8..365bcada6b91d93d55fe96d7e9ca49f17d50ed28 100644 (file)
@@ -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
index af298e6e27b76a6ac9d3e56e5be98425720d6ed7..acc2590132e3f18a5319c0e85663c468d79119bd 100644 (file)
@@ -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 ****************
 
index df40663fa02ddc565a47167b9519afdcb9b8ac52..1e512d8f9bbe3e5cc9e7f92abc70fc8b75317ba9 100644 (file)
@@ -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);
index 21bacc76a8c76c034f71a26c4edbd20c77a1c214..c3655ab2542d6906866f01183ce829c8d192044c 100644 (file)
@@ -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);
 }