[Bf-extensions-cvs] [85b61837] master: Add Advanced Objects: CubeSter vertex color changes, small cleanup
lijenstina
noreply at git.blender.org
Sat Mar 3 10:03:06 CET 2018
Commit: 85b618370f825e12a1a6412cf5c4fec053ac9f15
Author: lijenstina
Date: Sat Mar 3 10:02:03 2018 +0100
Branches: master
https://developer.blender.org/rBA85b618370f825e12a1a6412cf5c4fec053ac9f15
Add Advanced Objects: CubeSter vertex color changes, small cleanup
Bump version to 1.1.6
Some style tweaks
activelatticeobject unregister code not needed, since it was removed
in the previous commit
CubeSter module:
- Address the vertex color changes using versioning, search for the
**bl_version** and **get_colors** pattern in the code
- Fix a missed property call during previous refactor
- Remove an unused variable
===================================================================
M add_advanced_objects_menu/__init__.py
M add_advanced_objects_menu/cubester.py
===================================================================
diff --git a/add_advanced_objects_menu/__init__.py b/add_advanced_objects_menu/__init__.py
index 46a3dffc..42a33445 100644
--- a/add_advanced_objects_menu/__init__.py
+++ b/add_advanced_objects_menu/__init__.py
@@ -25,7 +25,7 @@
bl_info = {
"name": "Add Advanced Objects",
"author": "Meta Androcto",
- "version": (0, 1, 5),
+ "version": (0, 1, 6),
"blender": (2, 78, 0),
"location": "View3D > Add ",
"description": "Add Object & Camera extras",
@@ -55,7 +55,6 @@ if "bpy" in locals():
importlib.reload(arrange_on_curve)
importlib.reload(mesh_easylattice)
-
else:
from . import add_light_template
from . import scene_objects_bi
@@ -78,18 +77,18 @@ else:
import bpy
from bpy.types import (
- Menu,
- AddonPreferences,
- PropertyGroup,
- )
+ AddonPreferences,
+ Menu,
+ PropertyGroup,
+)
from bpy.props import (
- BoolProperty,
- EnumProperty,
- FloatProperty,
- IntProperty,
- StringProperty,
- PointerProperty,
- )
+ BoolProperty,
+ EnumProperty,
+ FloatProperty,
+ IntProperty,
+ StringProperty,
+ PointerProperty,
+)
# Define the "Scenes" menu
@@ -204,15 +203,15 @@ class AdvancedObjPreferences(AddonPreferences):
bl_idname = __name__
show_menu_list = BoolProperty(
- name="Menu List",
- description="Show/Hide the Add Menu items",
- default=False
- )
+ name="Menu List",
+ description="Show/Hide the Add Menu items",
+ default=False
+ )
show_panel_list = BoolProperty(
- name="Panels List",
- description="Show/Hide the Panel items",
- default=False
- )
+ name="Panels List",
+ description="Show/Hide the Panel items",
+ default=False
+ )
def draw(self, context):
layout = self.layout
@@ -315,214 +314,214 @@ class AdvancedObjProperties(PropertyGroup):
# cubester
# main properties
cubester_check_audio = BoolProperty(
- name="",
- default=False
- )
+ name="",
+ default=False
+ )
cubester_audio_image = EnumProperty(
- name="Input Type",
- items=(("image", "Image",
- "Use an Image as input for generating Geometry", "IMAGE_COL", 0),
- ("audio", "Audio",
- "Use a Sound Strip as input for generating Geometry", "FILE_SOUND", 1))
- )
+ name="Input Type",
+ items=(("image", "Image",
+ "Use an Image as input for generating Geometry", "IMAGE_COL", 0),
+ ("audio", "Audio",
+ "Use a Sound Strip as input for generating Geometry", "FILE_SOUND", 1))
+ )
cubester_audio_file_length = IntProperty(
- default=0
- )
+ default=0
+ )
# audio
cubester_audio_path = StringProperty(
- default="",
- name="Audio File",
- subtype="FILE_PATH",
- update=find_audio_length
- )
+ default="",
+ name="Audio File",
+ subtype="FILE_PATH",
+ update=find_audio_length
+ )
cubester_audio_min_freq = IntProperty(
- name="Minimum Frequency",
- min=20, max=100000,
- default=20
- )
+ name="Minimum Frequency",
+ min=20, max=100000,
+ default=20
+ )
cubester_audio_max_freq = IntProperty(
- name="Maximum Frequency",
- min=21, max=999999,
- default=5000
- )
+ name="Maximum Frequency",
+ min=21, max=999999,
+ default=5000
+ )
cubester_audio_offset_type = EnumProperty(
- name="Offset Type",
- items=(("freq", "Frequency Offset", ""),
- ("frame", "Frame Offset", "")),
- description="Type of offset per row of mesh"
- )
+ name="Offset Type",
+ items=(("freq", "Frequency Offset", ""),
+ ("frame", "Frame Offset", "")),
+ description="Type of offset per row of mesh"
+ )
cubester_audio_frame_offset = IntProperty(
- name="Frame Offset",
- min=0, max=10,
- default=2
- )
+ name="Frame Offset",
+ min=0, max=10,
+ default=2
+ )
cubester_audio_block_layout = EnumProperty(
- name="Block Layout",
- items=(("rectangle", "Rectangular", ""),
- ("radial", "Radial", ""))
- )
+ name="Block Layout",
+ items=(("rectangle", "Rectangular", ""),
+ ("radial", "Radial", ""))
+ )
cubester_audio_width_blocks = IntProperty(
- name="Width Block Count",
- min=1, max=10000,
- default=5
- )
+ name="Width Block Count",
+ min=1, max=10000,
+ default=5
+ )
cubester_audio_length_blocks = IntProperty(
- name="Length Block Count",
- min=1, max=10000,
- default=50
- )
+ name="Length Block Count",
+ min=1, max=10000,
+ default=50
+ )
# image
cubester_load_type = EnumProperty(
- name="Image Input Type",
- items=(("single", "Single Image", ""),
- ("multiple", "Image Sequence", ""))
- )
+ name="Image Input Type",
+ items=(("single", "Single Image", ""),
+ ("multiple", "Image Sequence", ""))
+ )
cubester_image = StringProperty(
- default="",
- name=""
- )
+ default="",
+ name=""
+ )
cubester_load_image = StringProperty(
- default="",
- name="Load Image",
- subtype="FILE_PATH",
- update=adjust_selected_image
- )
+ default="",
+ name="Load Image",
+ subtype="FILE_PATH",
+ update=adjust_selected_image
+ )
cubester_skip_images = IntProperty(
- name="Image Step",
- min=1, max=30,
- default=1,
- description="Step from image to image by this number"
- )
+ name="Image Step",
+ min=1, max=30,
+ default=1,
+ description="Step from image to image by this number"
+ )
cubester_max_images = IntProperty(
- name="Max Number Of Images",
- min=2, max=1000,
- default=10,
- description="Maximum number of images to be used"
- )
+ name="Max Number Of Images",
+ min=2, max=1000,
+ default=10,
+ description="Maximum number of images to be used"
+ )
cubester_frame_step = IntProperty(
- name="Frame Step Size",
- min=1, max=10,
- default=4,
- description="The number of frames each picture is used"
- )
+ name="Frame Step Size",
+ min=1, max=10,
+ default=4,
+ description="The number of frames each picture is used"
+ )
cubester_skip_pixels = IntProperty(
- name="Skip # Pixels",
- min=0, max=256,
- default=64,
- description="Skip this number of pixels before placing the next"
- )
+ name="Skip # Pixels",
+ min=0, max=256,
+ default=64,
+ description="Skip this number of pixels before placing the next"
+ )
cubester_mesh_style = EnumProperty(
- name="Mesh Type",
- items=(("blocks", "Blocks", ""),
- ("plane", "Plane", "")),
- description="Compose mesh of multiple blocks or of a single plane"
- )
+ name="Mesh Type",
+ items=(("blocks", "Blocks", ""),
+ ("plane", "Plane", "")),
+ description="Compose mesh of multiple blocks or of a single plane"
+ )
cubester_block_style = EnumProperty(
- name="Block Style",
- items=(("size", "Vary Size", ""),
- ("position", "Vary Position", "")),
- description="Vary Z-size of block, or vary Z-position"
- )
+ name="Block Style",
+ items=(("size", "Vary Size", ""),
+ ("position", "Vary Position", "")),
+ description="Vary Z-size of block, or vary Z-position"
+ )
cubester_height_scale = FloatProperty(
- name="Height Scale",
- subtype="DISTANCE",
- min=0.1, max=2,
- default=0.2
- )
+ name="Height Scale",
+ subtype="DISTANCE",
+ min=0.1, max=2,
+ default=0.2
+ )
cubester_invert = BoolProperty(
- name="Invert Height",
- default=False
- )
+ name="Invert Height",
+ default=False
+ )
# general adjustments
cubester_size_per_hundred_pixels = FloatProperty(
- name="Size Per 100 Blocks/Points",
- subtype="DISTANCE",
- min=0.001, max=5,
- default=1
- )
+ name="Size Per 100 Blocks/Points",
+ subtype="DISTANCE",
+ min=0.001, max=5,
+ default=1
+ )
# material based stuff
cubester_materials = EnumProperty(
- name="Material",
- items=(("vertex", "Vertex Colors", ""),
- ("image", "Image", "")),
- description="Color with vertex colors, or uv unwrap and use an image"
- )
+ name="Material",
+ items=(("vertex", "Vertex Colors", ""),
+ ("image", "Image", "")),
+ description="Color with vertex colors, or uv unwrap and use an image"
+ )
cubester_use_image_color = BoolProperty(
- name="Use Original Image Colors'?",
- default=True,
- description="Use original image colors, or replace with an another one"
- )
+ name="Use Original Image Colors'?",
+ default=True,
+ description="Use original image colors, or replace with an another one"
+ )
cubester_color_image = StringProperty(
- default="",
- name=""
- )
+ default="",
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list