[Bf-blender-cvs] [beca377c278] ui_layout_gridflow: Merge branch 'blender2.8' into ui_layout_gridflow

Bastien Montagne noreply at git.blender.org
Sun Jun 3 16:36:05 CEST 2018


Commit: beca377c278fe7a1eedbd4491ece2686150081f0
Author: Bastien Montagne
Date:   Sat Jun 2 19:30:26 2018 +0200
Branches: ui_layout_gridflow
https://developer.blender.org/rBbeca377c278fe7a1eedbd4491ece2686150081f0

Merge branch 'blender2.8' into ui_layout_gridflow

Conflicts:
	release/scripts/startup/bl_ui/properties_texture.py
	source/blenderplayer/bad_level_call_stubs/stubs.c

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/properties_texture.py
index 2f977088ad7,aa3227e0b72..b7dc8ec9d4e
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@@ -1055,169 -710,34 +710,67 @@@ class TEXTURE_PT_influence(TextureSlotP
              sub.prop(tex, factor, text=name, slider=True)
              return sub  # XXX, temp. use_map_normal needs to override.
  
-         if isinstance(idblock, Material):
-             if idblock.type in {'SURFACE', 'WIRE'}:
-                 box = layout.box()
-                 box.label(text="¡OLD LAYOUT!")
-                 
-                 split = box.split()
- 
-                 col = split.column()
-                 col.label(text="Diffuse:")
-                 factor_but(col, "use_map_diffuse", "diffuse_factor", "Intensity")
-                 factor_but(col, "use_map_color_diffuse", "diffuse_color_factor", "Color")
-                 factor_but(col, "use_map_alpha", "alpha_factor", "Alpha")
-                 factor_but(col, "use_map_translucency", "translucency_factor", "Translucency")
- 
-                 col.label(text="Specular:")
-                 factor_but(col, "use_map_specular", "specular_factor", "Intensity")
-                 factor_but(col, "use_map_color_spec", "specular_color_factor", "Color")
-                 factor_but(col, "use_map_hardness", "hardness_factor", "Hardness")
- 
-                 col = split.column()
-                 col.label(text="Shading:")
-                 factor_but(col, "use_map_ambient", "ambient_factor", "Ambient")
-                 factor_but(col, "use_map_emit", "emit_factor", "Emit")
-                 factor_but(col, "use_map_mirror", "mirror_factor", "Mirror")
-                 factor_but(col, "use_map_raymir", "raymir_factor", "Ray Mirror")
- 
-                 col.label(text="Geometry:")
-                 # XXX replace 'or' when displacement is fixed to not rely on normal influence value.
-                 sub_tmp = factor_but(col, "use_map_normal", "normal_factor", "Normal")
-                 sub_tmp.active = (tex.use_map_normal or tex.use_map_displacement)
-                 # END XXX
- 
-                 factor_but(col, "use_map_warp", "warp_factor", "Warp")
-                 factor_but(col, "use_map_displacement", "displacement_factor", "Displace")
- 
-                 #~ sub = col.column()
-                 #~ sub.active = tex.use_map_translucency or tex.map_emit or tex.map_alpha or tex.map_raymir or tex.map_hardness or tex.map_ambient or tex.map_specularity or tex.map_reflection or tex.map_mirror
-                 #~ sub.prop(tex, "default_value", text="Amount", slider=True)
- 
-                 layout.separator()
-                 box = layout.box()
-                 box.label(text="¡GRID FLOW LAYOUT!")
- 
-                 gflow = box.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False)
- 
-                 col = gflow.column()
-                 col.label(text="Diffuse:")
-                 factor_but(col, "use_map_diffuse", "diffuse_factor", "Intensity")
-                 factor_but(col, "use_map_color_diffuse", "diffuse_color_factor", "Color")
-                 factor_but(col, "use_map_alpha", "alpha_factor", "Alpha")
-                 factor_but(col, "use_map_translucency", "translucency_factor", "Translucency")
- 
-                 col = gflow.column()
-                 col.label(text="Shading:")
-                 factor_but(col, "use_map_ambient", "ambient_factor", "Ambient")
-                 factor_but(col, "use_map_emit", "emit_factor", "Emit")
-                 factor_but(col, "use_map_mirror", "mirror_factor", "Mirror")
-                 factor_but(col, "use_map_raymir", "raymir_factor", "Ray Mirror")
- 
-                 col = gflow.column()
-                 col.label(text="Specular:")
-                 factor_but(col, "use_map_specular", "specular_factor", "Intensity")
-                 factor_but(col, "use_map_color_spec", "specular_color_factor", "Color")
-                 factor_but(col, "use_map_hardness", "hardness_factor", "Hardness")
- 
-                 col = gflow.column()
-                 col.label(text="Geometry:")
-                 # XXX replace 'or' when displacement is fixed to not rely on normal influence value.
-                 sub_tmp = factor_but(col, "use_map_normal", "normal_factor", "Normal")
-                 sub_tmp.active = (tex.use_map_normal or tex.use_map_displacement)
-                 # END XXX
-                 factor_but(col, "use_map_warp", "warp_factor", "Warp")
-                 factor_but(col, "use_map_displacement", "displacement_factor", "Displace")
- 
- 
- 
-             elif idblock.type == 'HALO':
-                 layout.label(text="Halo:")
- 
-                 split = layout.split()
- 
-                 col = split.column()
-                 factor_but(col, "use_map_color_diffuse", "diffuse_color_factor", "Color")
-                 factor_but(col, "use_map_alpha", "alpha_factor", "Alpha")
- 
-                 col = split.column()
-                 factor_but(col, "use_map_raymir", "raymir_factor", "Size")
-                 factor_but(col, "use_map_hardness", "hardness_factor", "Hardness")
-                 factor_but(col, "use_map_translucency", "translucency_factor", "Add")
-             elif idblock.type == 'VOLUME':
-                 layout.label(text="Volume:")
- 
-                 split = layout.split()
- 
-                 col = split.column()
-                 factor_but(col, "use_map_density", "density_factor", "Density")
-                 factor_but(col, "use_map_emission", "emission_factor", "Emission")
-                 factor_but(col, "use_map_scatter", "scattering_factor", "Scattering")
-                 factor_but(col, "use_map_reflect", "reflection_factor", "Reflection")
- 
-                 col = split.column()
-                 col.label(text=" ")
-                 factor_but(col, "use_map_color_emission", "emission_color_factor", "Emission Color")
-                 factor_but(col, "use_map_color_transmission", "transmission_color_factor", "Transmission Color")
-                 factor_but(col, "use_map_color_reflection", "reflection_color_factor", "Reflection Color")
- 
-                 layout.label(text="Geometry:")
- 
-                 split = layout.split()
- 
-                 col = split.column()
-                 factor_but(col, "use_map_warp", "warp_factor", "Warp")
- 
-                 col = split.column()
-                 factor_but(col, "use_map_displacement", "displacement_factor", "Displace")
- 
-         elif isinstance(idblock, Lamp):
-             split = layout.split()
+         if isinstance(idblock, ParticleSettings):
 -            split = layout.split()
++            box = layout.box()
++            box.label(text="¡OLD LAYOUT!")
++            
++            split = box.split()
  
              col = split.column()
-             factor_but(col, "use_map_color", "color_factor", "Color")
+             col.label(text="General:")
+             factor_but(col, "use_map_time", "time_factor", "Time")
+             factor_but(col, "use_map_life", "life_factor", "Lifetime")
+             factor_but(col, "use_map_density", "density_factor", "Density")
+             factor_but(col, "use_map_size", "size_factor", "Size")
  
              col = split.column()
-             factor_but(col, "use_map_shadow", "shadow_factor", "Shadow")
+             col.label(text="Physics:")
+             factor_but(col, "use_map_velocity", "velocity_factor", "Velocity")
+             factor_but(col, "use_map_damp", "damp_factor", "Damp")
+             factor_but(col, "use_map_gravity", "gravity_factor", "Gravity")
+             factor_but(col, "use_map_field", "field_factor", "Force Fields")
  
-         elif isinstance(idblock, World):
-             split = layout.split()
 -            layout.label(text="Hair:")
++            box.label(text="Hair:")
  
-             col = split.column()
-             factor_but(col, "use_map_blend", "blend_factor", "Blend")
-             factor_but(col, "use_map_horizon", "horizon_factor", "Horizon")
 -            split = layout.split()
++            split = box.split()
  
              col = split.column()
-             factor_but(col, "use_map_zenith_up", "zenith_up_factor", "Zenith Up")
-             factor_but(col, "use_map_zenith_down", "zenith_down_factor", "Zenith Down")
-         elif isinstance(idblock, ParticleSettings):
-             split = layout.split()
+             factor_but(col, "use_map_length", "length_factor", "Length")
+             factor_but(col, "use_map_clump", "clump_factor", "Clump")
+             factor_but(col, "use_map_twist", "twist_factor", "Twist")
  
              col = split.column()
+             factor_but(col, "use_map_kink_amp", "kink_amp_factor", "Kink Amplitude")
++            factor_but(col, "use_map_kink_freq", "kink_freq_factor", "Kink Frequency")
++            factor_but(col, "use_map_rough", "rough_factor", "Rough")
++
++
++            layout.separator()
++            box = layout.box()
++            box.label(text="¡GRID FLOW LAYOUT!")
++
++            gflow = box.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False)
++
++            col = gflow.column()
 +            col.label(text="General:")
 +            factor_but(col, "use_map_time", "time_factor", "Time")
 +            factor_but(col, "use_map_life", "life_factor", "Lifetime")
 +            factor_but(col, "use_map_density", "density_factor", "Density")
 +            factor_but(col, "use_map_size", "size_factor", "Size")
 +
-             col = split.column()
++            col = gflow.column()
 +            col.label(text="Physics:")
 +            factor_but(col, "use_map_velocity", "velocity_factor", "Velocity")
 +            factor_but(col, "use_map_damp", "damp_factor", "Damp")
 +            factor_but(col, "use_map_gravity", "gravity_factor", "Gravity")
 +            factor_but(col, "use_map_field", "field_factor", "Force Fields")
 +
-             layout.label(text="Hair:")
- 
-             split = layout.split()
- 
-             col = split.column()
++            col = gflow.column()
++            col.labe

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list