date:20160702

[Bf-blender-cvs] [2c9add9] master: Fix use of uninitialized variable in Cycles OpenCL image textures.

2016-07-02 Thread Brecht Van Lommel

Commit: 2c9add965b27b4fbb3a2ed99bd248c7b2b41ddcc
Author: Brecht Van Lommel
Date:   Sat Jul 2 14:11:11 2016 +0200
Branches: master
https://developer.blender.org/rB2c9add965b27b4fbb3a2ed99bd248c7b2b41ddcc

Fix use of uninitialized variable in Cycles OpenCL image textures.

===

M   intern/cycles/render/image.cpp

===

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index d497661..614620c 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -1078,7 +1078,8 @@ void ImageManager::device_update_slot(Device *device,
 
 uint8_t ImageManager::pack_image_options(ImageDataType type, size_t slot)
 {
-   uint8_t options;
+   uint8_t options = 0;
+
/* Image Options are packed into one uint:
 * bit 0 -> Interpolation
 * bit 1 + 2  + 3-> Extension */

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

[Bf-blender-cvs] [0d4961c] master: Fix typo in bgl.Buffer report function

2016-07-02 Thread Thomas Szepe

Commit: 0d4961cc52ce3a66da4f5686a4e63a46aed6de67
Author: Thomas Szepe
Date:   Sat Jul 2 18:38:05 2016 +0200
Branches: master
https://developer.blender.org/rB0d4961cc52ce3a66da4f5686a4e63a46aed6de67

Fix typo in bgl.Buffer report function

A GL_INT buffer was reported as GL_BYTE.

===

M   source/blender/python/generic/bgl.c

===

diff --git a/source/blender/python/generic/bgl.c 
b/source/blender/python/generic/bgl.c
index 4bd2e9d..3ea1022 100644
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -983,7 +983,7 @@ static PyObject *Buffer_repr(Buffer *self)
switch (self->type) {
case GL_BYTE:   typestr = "GL_BYTE"; break;
case GL_SHORT:  typestr = "GL_SHORT"; break;
-   case GL_INT:typestr = "GL_BYTE"; break;
+   case GL_INT:typestr = "GL_INT"; break;
case GL_FLOAT:  typestr = "GL_FLOAT"; break;
case GL_DOUBLE: typestr = "GL_DOUBLE"; break;
default:typestr = "UNKNOWN"; break;

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

[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61687] trunk/lib/darwin-9.x.universal/alembic: Add alembic 1.6

2016-07-02 Thread jens verwiebe

Revision: 61687
  https://developer.blender.org/rBL61687
Author:   jensverwiebe
Date: 2016-07-02 18:33:57 +0200 (Sat, 02 Jul 2016)
Log Message:
---
Add alembic 1.6

Added Paths:
---
trunk/lib/darwin-9.x.universal/alembic/include/
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/All.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ArchiveInfo.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Argument.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Base.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ErrorHandler.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Foundation.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArchive.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IArrayProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IBaseProperty.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ICompoundProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IObject.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISampleSelector.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/IScalarProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISchema.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ISchemaObject.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ITypedArrayProperty.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/ITypedScalarProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OArchive.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OArrayProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OBaseProperty.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OCompoundProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OObject.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OScalarProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OSchema.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OSchemaObject.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OTypedArrayProperty.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/OTypedScalarProperty.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/Reference.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/SourceName.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/TypedArraySample.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/Abc/TypedPropertyTraits.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/All.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/ICollections.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/OCollections.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCollection/SchemaInfoDeclarations.h
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/
trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/All.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArchiveReader.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArchiveWriter.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArrayPropertyReader.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArrayPropertyWriter.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArraySample.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ArraySampleKey.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/BasePropertyReader.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/BasePropertyWriter.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/CompoundPropertyReader.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/CompoundPropertyWriter.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/DataType.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ForwardDeclarations.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/Foundation.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/MetaData.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ObjectHeader.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ObjectReader.h

trunk/lib/darwin-9.x.universal/alembic/include/Alembic/AbcCoreAbstract/ObjectWrite

[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61686] trunk/lib/darwin-9.x.universal/alembic: Remove alembic 1.5.x

2016-07-02 Thread jens verwiebe

Revision: 61686
  https://developer.blender.org/rBL61686
Author:   jensverwiebe
Date: 2016-07-02 18:33:00 +0200 (Sat, 02 Jul 2016)
Log Message:
---
Remove alembic 1.5.x

Removed Paths:
-
trunk/lib/darwin-9.x.universal/alembic/include/
trunk/lib/darwin-9.x.universal/alembic/lib/

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

[Bf-blender-cvs] [ee90bad] master: Install Deps: Use OSL 1.7.3, latest bugfix release.

2016-07-02 Thread Thomas Dinges

Commit: ee90badbd5b3cfc398f9c793a04a1df71ea042b7
Author: Thomas Dinges
Date:   Sat Jul 2 18:07:20 2016 +0200
Branches: master
https://developer.blender.org/rBee90badbd5b3cfc398f9c793a04a1df71ea042b7

Install Deps: Use OSL 1.7.3, latest bugfix release.

===

M   build_files/build_environment/install_deps.sh

===

diff --git a/build_files/build_environment/install_deps.sh 
b/build_files/build_environment/install_deps.sh
index e380362..068ac66 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -321,7 +321,7 @@ LLVM_FORCE_REBUILD=false
 LLVM_SKIP=false
 
 # OSL needs to be compiled for now!
-OSL_VERSION="1.7.1"
+OSL_VERSION="1.7.3"
 OSL_VERSION_MIN=$OSL_VERSION
 OSL_FORCE_BUILD=false
 OSL_FORCE_REBUILD=false
@@ -1742,7 +1742,7 @@ compile_OSL() {
   fi
 
   # To be changed each time we make edits that would modify the compiled 
result!
-  osl_magic=20
+  osl_magic=21
   _init_osl
 
   # Clean install if needed!

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

[Bf-blender-cvs] [aef7212] master: Correction for MSVC

2016-07-02 Thread Campbell Barton

Commit: aef72125da1ee971334c3e3b34f0b9ca06e57f9f
Author: Campbell Barton
Date:   Sat Jul 2 20:21:39 2016 +1000
Branches: master
https://developer.blender.org/rBaef72125da1ee971334c3e3b34f0b9ca06e57f9f

Correction for MSVC

===

M   source/blender/collada/collada_utils.cpp

===

diff --git a/source/blender/collada/collada_utils.cpp 
b/source/blender/collada/collada_utils.cpp
index c90deee..649c86e 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -357,10 +357,11 @@ void bc_triangulate_mesh(Mesh *me)
bool use_beauty  = false;
bool tag_only= false;
int  quad_method = MOD_TRIANGULATE_QUAD_SHORTEDGE; /* XXX: The 
triangulation method selection could be offered in the UI */
-
+
+   const struct BMeshCreateParams bm_create_params = {0};
BMesh *bm = BM_mesh_create(
&bm_mesh_allocsize_default,
-   &((struct BMeshCreateParams){.use_toolflags = false,}));
+   &bm_create_params);
BMeshFromMeshParams bm_from_me_params = {0};
bm_from_me_params.calc_face_normal = true;
BM_mesh_bm_from_me(bm, me, &bm_from_me_params);

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

[Bf-blender-cvs] [b104764] master: BMesh: utility function to resize bmesh elements

2016-07-02 Thread Campbell Barton

Commit: b1047640ad8bc99a3e959e3ae01e6597b9e29575
Author: Campbell Barton
Date:   Sat Jul 2 18:07:58 2016 +1000
Branches: master
https://developer.blender.org/rBb1047640ad8bc99a3e959e3ae01e6597b9e29575

BMesh: utility function to resize bmesh elements

This can be used to re-allocate bmesh data with/without tool flags.
Needed for Symmetrize since it uses bmesh operators from dyntopo.

===

M   source/blender/bmesh/intern/bmesh_mesh.c
M   source/blender/bmesh/intern/bmesh_mesh.h
M   source/blender/editors/sculpt_paint/sculpt.c

===

diff --git a/source/blender/bmesh/intern/bmesh_mesh.c 
b/source/blender/bmesh/intern/bmesh_mesh.c
index 71b5775..32aa80a 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -48,7 +48,9 @@
 const BMAllocTemplate bm_mesh_allocsize_default = {512, 1024, 2048, 512};
 const BMAllocTemplate bm_mesh_chunksize_default = {512, 1024, 2048, 512};
 
-static void bm_mempool_init(BMesh *bm, const BMAllocTemplate *allocsize, const 
bool use_toolflags)
+static void bm_mempool_init_ex(
+const BMAllocTemplate *allocsize, const bool use_toolflags,
+BLI_mempool **r_vpool, BLI_mempool **r_epool, BLI_mempool **r_lpool, 
BLI_mempool **r_fpool)
 {
size_t vert_size, edge_size, loop_size, face_size;
 
@@ -65,18 +67,33 @@ static void bm_mempool_init(BMesh *bm, const 
BMAllocTemplate *allocsize, const b
face_size = sizeof(BMFace);
}
 
-   bm->vpool = BLI_mempool_create(
-   vert_size, allocsize->totvert,
-   bm_mesh_chunksize_default.totvert, BLI_MEMPOOL_ALLOW_ITER);
-   bm->epool = BLI_mempool_create(
-   edge_size, allocsize->totedge,
-   bm_mesh_chunksize_default.totedge, BLI_MEMPOOL_ALLOW_ITER);
-   bm->lpool = BLI_mempool_create(
-   loop_size, allocsize->totloop,
-   bm_mesh_chunksize_default.totloop, BLI_MEMPOOL_NOP);
-   bm->fpool = BLI_mempool_create(
-   face_size, allocsize->totface,
-   bm_mesh_chunksize_default.totface, BLI_MEMPOOL_ALLOW_ITER);
+   if (r_vpool) {
+   *r_vpool = BLI_mempool_create(
+   vert_size, allocsize->totvert,
+   bm_mesh_chunksize_default.totvert, 
BLI_MEMPOOL_ALLOW_ITER);
+   }
+   if (r_epool) {
+   *r_epool = BLI_mempool_create(
+   edge_size, allocsize->totedge,
+   bm_mesh_chunksize_default.totedge, 
BLI_MEMPOOL_ALLOW_ITER);
+   }
+   if (r_lpool) {
+   *r_lpool = BLI_mempool_create(
+   loop_size, allocsize->totloop,
+   bm_mesh_chunksize_default.totloop, BLI_MEMPOOL_NOP);
+   }
+   if (r_fpool) {
+   *r_fpool = BLI_mempool_create(
+   face_size, allocsize->totface,
+   bm_mesh_chunksize_default.totface, 
BLI_MEMPOOL_ALLOW_ITER);
+   }
+}
+
+static void bm_mempool_init(BMesh *bm, const BMAllocTemplate *allocsize, const 
bool use_toolflags)
+{
+   bm_mempool_init_ex(
+   allocsize, use_toolflags,
+   &bm->vpool, &bm->epool, &bm->lpool, &bm->fpool);
 
 #ifdef USE_BMESH_HOLES
bm->looplistpool = BLI_mempool_create(sizeof(BMLoopList), 512, 512, 
BLI_MEMPOOL_NOP);
@@ -1733,3 +1750,262 @@ void BM_mesh_remap(
if (fptr_map)
BLI_ghash_free(fptr_map, NULL, NULL);
 }
+
+/**
+ * Use new memory pools for this mesh.
+ *
+ * \note needed for re-sizing elements (adding/removing tool flags)
+ * but could also be used for packing fragmented bmeshes.
+ */
+void BM_mesh_rebuild(
+BMesh *bm, const struct BMeshCreateParams *params,
+BLI_mempool *vpool_dst, BLI_mempool *epool_dst, BLI_mempool 
*lpool_dst, BLI_mempool *fpool_dst)
+{
+   const char remap =
+   (vpool_dst ? BM_VERT : 0) |
+   (epool_dst ? BM_EDGE : 0) |
+   (lpool_dst ? BM_LOOP : 0) |
+   (fpool_dst ? BM_FACE : 0);
+
+   BMVert **vtable_dst = (remap & BM_VERT) ? MEM_mallocN(bm->totvert * 
sizeof(BMVert *), __func__) : NULL;
+   BMEdge **etable_dst = (remap & BM_EDGE) ? MEM_mallocN(bm->totedge * 
sizeof(BMEdge *), __func__) : NULL;
+   BMLoop **ltable_dst = (remap & BM_LOOP) ? MEM_mallocN(bm->totloop * 
sizeof(BMLoop *), __func__) : NULL;
+   BMFace **ftable_dst = (remap & BM_FACE) ? MEM_mallocN(bm->totface * 
sizeof(BMFace *), __func__) : NULL;
+
+   const bool use_toolflags = params->use_toolflags;
+
+   if (remap & BM_VERT) {
+   BMIter iter;
+   int index;
+   BMVert *v_src;
+   BM_ITER_MESH_INDEX (v_src, &iter, bm, BM_VERTS_OF_MESH, index) {
+   BMVert *v_dst = BLI_mempool_alloc(vpool_dst);
+   memcpy(v_ds

[Bf-blender-cvs] [9f5621b] master: Cleanup: comment blocks

2016-07-02 Thread Campbell Barton

Commit: 9f5621bb4ae9f2cd431f80d2ede732639d7dbe37
Author: Campbell Barton
Date:   Sat Jul 2 10:02:04 2016 +1000
Branches: master
https://developer.blender.org/rB9f5621bb4ae9f2cd431f80d2ede732639d7dbe37

Cleanup: comment blocks

===

M   intern/cycles/kernel/geom/geom_curve.h
M   intern/cycles/kernel/kernel_light.h
M   intern/cycles/kernel/kernel_types.h
M   intern/cycles/render/nodes.cpp
M   intern/decklink/DeckLinkAPI.cpp
M   intern/decklink/DeckLinkAPI.h
M   intern/gpudirect/dvpapi.cpp
M   intern/gpudirect/dvpapi.h
M   source/blender/blenkernel/BKE_bvhutils.h
M   source/blender/blenkernel/intern/mball_tessellate.c
M   source/blender/blenkernel/intern/softbody.c
M   source/blender/blenlib/intern/BLI_kdopbvh.c
M   source/blender/bmesh/tools/bmesh_bevel.c
M   source/blender/collada/collada_utils.cpp
M   source/blender/compositor/intern/COM_OpenCLDevice.h
M   source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M   source/blender/editors/gpencil/gpencil_utils.c
M   source/blender/editors/space_view3d/drawobject.c
M   source/blender/editors/transform/transform_snap_object.c
M   source/blender/freestyle/intern/geometry/normal_cycle.h
M   
source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
M   source/blender/freestyle/intern/scene_graph/FrsMaterial.h
M   source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h
M   source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
M   source/blender/freestyle/intern/stroke/Stroke.h
M   source/blender/freestyle/intern/view_map/Functions0D.h
M   source/blender/freestyle/intern/view_map/Silhouette.h
M   source/blender/freestyle/intern/winged_edge/Curvature.cpp
M   source/blender/modifiers/intern/MOD_correctivesmooth.c
M   source/blender/modifiers/intern/MOD_wireframe.c
M   source/blender/nodes/shader/nodes/node_shader_brightness.c
M   source/blender/nodes/shader/nodes/node_shader_gamma.c
M   source/blender/python/intern/bpy_interface.c
M   source/blender/render/intern/source/pipeline.c
M   source/gameengine/Expressions/intern/IntValue.cpp
M   source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
M   source/gameengine/Physics/Bullet/CcdPhysicsController.h
M   source/gameengine/Rasterizer/RAS_IOffScreen.h
M   source/gameengine/Rasterizer/RAS_ISync.h
M   
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLOffScreen.cpp
M   source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLOffScreen.h
M   source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLSync.cpp
M   source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLSync.h
M   source/gameengine/VideoTexture/DeckLink.cpp
M   source/gameengine/VideoTexture/DeckLink.h
M   source/gameengine/VideoTexture/VideoDeckLink.cpp
M   source/gameengine/VideoTexture/VideoDeckLink.h

===

diff --git a/intern/cycles/kernel/geom/geom_curve.h 
b/intern/cycles/kernel/geom/geom_curve.h
index 8894843..292e1bf 100644
--- a/intern/cycles/kernel/geom/geom_curve.h
+++ b/intern/cycles/kernel/geom/geom_curve.h
@@ -450,8 +450,8 @@ ccl_device_inline bool 
bvh_cardinal_curve_intersect(KernelGlobals *kg, Intersect
else if(level == 1) {
 
/* the maximum recursion depth is reached.
-   * check if dP0.(Q-P0)>=0 and dPn.(Pn-Q)>=0.
-   * dP* is reversed if necessary.*/
+* check if dP0.(Q-P0)>=0 and dPn.(Pn-Q)>=0.
+* dP* is reversed if necessary.*/
float t = isect->t;
float u = 0.0f;
float gd = 0.0f;
diff --git a/intern/cycles/kernel/kernel_light.h 
b/intern/cycles/kernel/kernel_light.h
index 736a884..93c4bd3 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -51,8 +51,8 @@ ccl_device float area_light_sample(float3 P,
bool sample_coord)
 {
/* In our name system we're using P for the center,
-   * which is o in the paper.
-   */
+* which is o in the paper.
+*/
 
float3 corner = *light_p - axisu * 0.5f - axisv * 0.5f;
float axisu_len, axisv_len;
diff --git a/intern/cycles/kernel/kernel_types.h 
b/intern/cycles/kernel/kernel_types.h
index 76d2a6b..2187e3c 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -769,7 +769,7 @@ typedef ccl_addr_space struct ShaderData {
int type;
 
/* parametric coordinates
-   * - barycentric weights for triangles */
+* - barycentric weights for triangles */
float u;
float v;
/* object id if there is one, ~0 otherwise */
@@ -792,14 +792,14 @@ typedef ccl_a

[Bf-blender-cvs] [1077514] master: Cleanup: style

2016-07-02 Thread Campbell Barton

Commit: 1077514896688e4f439cbd20e0f0c65c88048978
Author: Campbell Barton
Date:   Sat Jul 2 10:00:30 2016 +1000
Branches: master
https://developer.blender.org/rB1077514896688e4f439cbd20e0f0c65c88048978

Cleanup: style

===

M   source/blender/editors/object/object_constraint.c
M   source/blender/editors/space_outliner/outliner_edit.c
M   source/blender/editors/space_view3d/drawmesh.c

===

diff --git a/source/blender/editors/object/object_constraint.c 
b/source/blender/editors/object/object_constraint.c
index 9c2806f..d7b7fd7 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -1651,7 +1651,7 @@ static bool get_new_constraint_target(bContext *C, int 
con_type, Object **tar_ob
break;
}
else if (((!only_curve) || (ob->type == 
OB_CURVE)) &&
-((!only_mesh) || (ob->type == OB_MESH)))
+((!only_mesh) || (ob->type == 
OB_MESH)))
{
/* set target */
*tar_ob = ob;
diff --git a/source/blender/editors/space_outliner/outliner_edit.c 
b/source/blender/editors/space_outliner/outliner_edit.c
index 7990c16..07608b5 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -857,7 +857,7 @@ void object_toggle_selectability_cb(
 }
 
 void group_toggle_selectability_cb(
-bContext *UNUSED(C), ReportList *reports, Scene *scene, TreeElement 
*UNUSED(te),
+bContext *UNUSED(C), ReportList *UNUSED(reports), Scene *scene, 
TreeElement *UNUSED(te),
 TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void 
*UNUSED(user_data))
 {
Group *group = (Group *)tselem->id;
diff --git a/source/blender/editors/space_view3d/drawmesh.c 
b/source/blender/editors/space_view3d/drawmesh.c
index e0cba8d..791ece1 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -986,7 +986,8 @@ static void draw_mesh_textured_old(Scene *scene, View3D 
*v3d, RegionView3D *rv3d
else if ((ob->mode & OB_MODE_TEXTURE_PAINT) == 0) {
dm_draw_flag |= DM_DRAW_USE_COLORS;
}
-   } else {
+   }
+   else {
if ((ob->mode & OB_MODE_TEXTURE_PAINT) == 0) {
dm_draw_flag |= DM_DRAW_USE_COLORS;
}

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

[Bf-blender-cvs] [2c9add9] master: Fix use of uninitialized variable in Cycles OpenCL image textures.

[Bf-blender-cvs] [0d4961c] master: Fix typo in bgl.Buffer report function

[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61687] trunk/lib/darwin-9.x.universal/alembic: Add alembic 1.6

[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61686] trunk/lib/darwin-9.x.universal/alembic: Remove alembic 1.5.x

[Bf-blender-cvs] [ee90bad] master: Install Deps: Use OSL 1.7.3, latest bugfix release.

[Bf-blender-cvs] [aef7212] master: Correction for MSVC

[Bf-blender-cvs] [b104764] master: BMesh: utility function to resize bmesh elements

[Bf-blender-cvs] [9f5621b] master: Cleanup: comment blocks

[Bf-blender-cvs] [1077514] master: Cleanup: style

9 matches

Site Navigation

Mail list logo

Footer information