[Bf-blender-cvs] [a542f50b51a] master: Fix T67523: Incorrect UV's for grid primitive

[matc]

Commit: a542f50b51af0167acc55d4cf2b06490a704ce93
Author: matc
Date:   Mon Jul 29 14:26:39 2019 +1000
Branches: master
https://developer.blender.org/rBa542f50b51af0167acc55d4cf2b06490a704ce93

Fix T67523: Incorrect UV's for grid primitive

===

M   source/blender/bmesh/operators/bmo_primitive.c

===

diff --git a/source/blender/bmesh/operators/bmo_primitive.c 
b/source/blender/bmesh/operators/bmo_primitive.c
index cf3d6b8bf56..2eedefe7980 100644
--- a/source/blender/bmesh/operators/bmo_primitive.c
+++ b/source/blender/bmesh/operators/bmo_primitive.c
@@ -807,6 +807,7 @@ void BM_mesh_calc_uvs_grid(BMesh *bm,
 
   const float dx = 1.0f / (float)(x_segments - 1);
   const float dy = 1.0f / (float)(y_segments - 1);
+  const float dx_wrap = 1.0 - (dx / 2.0f);
   float x = 0.0f;
   float y = dy;
 
@@ -844,7 +845,7 @@ void BM_mesh_calc_uvs_grid(BMesh *bm,
 }
 
 x += dx;
-if (x >= 1.0f) {
+if (x >= dx_wrap) {
   x = 0.0f;
   y += dy;
 }

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [2d98ac33bef] master: Fix T65402: Syntax error causes CPython assert

[matc]

Commit: 2d98ac33bef3b0dcba7bcffa3c37e35491a01d5c
Author: matc
Date:   Tue Jul 23 20:29:11 2019 +1000
Branches: master
https://developer.blender.org/rB2d98ac33bef3b0dcba7bcffa3c37e35491a01d5c

Fix T65402: Syntax error causes CPython assert

===

M   source/blender/python/intern/bpy_traceback.c

===

diff --git a/source/blender/python/intern/bpy_traceback.c 
b/source/blender/python/intern/bpy_traceback.c
index c9c9e4adafb..06d8b645ac7 100644
--- a/source/blender/python/intern/bpy_traceback.c
+++ b/source/blender/python/intern/bpy_traceback.c
@@ -143,7 +143,6 @@ void python_script_error_jump(const char *filepath, int 
*lineno, int *offset)
 /* no traceback available when SyntaxError.
  * python has no api's to this. reference parse_syntax_error() from 
pythonrun.c */
 PyErr_NormalizeException(&exception, &value, (PyObject **)&tb);
-PyErr_Restore(exception, value, (PyObject *)tb); /* takes away reference! 
*/
 
 if (value) { /* should always be true */
   PyObject *message;
@@ -165,6 +164,7 @@ void python_script_error_jump(const char *filepath, int 
*lineno, int *offset)
 *lineno = -1;
   }
 }
+PyErr_Restore(exception, value, (PyObject *)tb); /* takes away reference! 
*/
   }
   else {
 PyErr_NormalizeException(&exception, &value, (PyObject **)&tb);

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

[Bf-blender-cvs] [2cc303700b6] master: Fix: Add poll methods for quick effects operators

[matc]

Commit: 2cc303700b65b70e731848e36dd24790b0a88166
Author: matc
Date:   Tue Mar 19 17:16:49 2019 +0100
Branches: master
https://developer.blender.org/rB2cc303700b65b70e731848e36dd24790b0a88166

Fix: Add poll methods for quick effects operators

Differential Revision: https://developer.blender.org/D4259

===

M   release/scripts/startup/bl_operators/object_quick_effects.py

===

diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py 
b/release/scripts/startup/bl_operators/object_quick_effects.py
index 37c4af593c5..54673b24520 100644
--- a/release/scripts/startup/bl_operators/object_quick_effects.py
+++ b/release/scripts/startup/bl_operators/object_quick_effects.py
@@ -46,8 +46,12 @@ def object_ensure_material(obj, mat_name):
 obj.data.materials.append(mat)
 return mat
 
+class ObjectModeOperator:
+@classmethod
+def poll(cls, context):
+return context.mode == 'OBJECT'
 
-class QuickFur(Operator):
+class QuickFur(ObjectModeOperator, Operator):
 bl_idname = "object.quick_fur"
 bl_label = "Quick Fur"
 bl_options = {'REGISTER', 'UNDO'}
@@ -77,7 +81,7 @@ class QuickFur(Operator):
 def execute(self, context):
 fake_context = context.copy()
 mesh_objects = [obj for obj in context.selected_objects
-if obj.type == 'MESH' and obj.mode == 'OBJECT']
+if obj.type == 'MESH']
 
 if not mesh_objects:
 self.report({'ERROR'}, "Select at least one mesh object")
@@ -112,7 +116,7 @@ class QuickFur(Operator):
 return {'FINISHED'}
 
 
-class QuickExplode(Operator):
+class QuickExplode(ObjectModeOperator, Operator):
 bl_idname = "object.quick_explode"
 bl_label = "Quick Explode"
 bl_options = {'REGISTER', 'UNDO'}
@@ -318,7 +322,7 @@ def grid_location(x, y):
 return (x * 200, y * 150)
 
 
-class QuickSmoke(Operator):
+class QuickSmoke(ObjectModeOperator, Operator):
 bl_idname = "object.quick_smoke"
 bl_label = "Quick Smoke"
 bl_options = {'REGISTER', 'UNDO'}
@@ -422,7 +426,7 @@ class QuickSmoke(Operator):
 return {'FINISHED'}
 
 
-class QuickFluid(Operator):
+class QuickFluid(ObjectModeOperator, Operator):
 bl_idname = "object.quick_fluid"
 bl_label = "Quick Fluid"
 bl_options = {'REGISTER', 'UNDO'}

___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs