[Bf-blender-cvs] [091db5fb961] greasepencil-object: Assorted Cleanup/Fixes

Joshua Leung noreply at git.blender.org
Tue Jul 24 07:26:39 CEST 2018


Commit: 091db5fb9619887673c3d3b0b717776b6035d163
Author: Joshua Leung
Date:   Tue Jul 24 02:32:45 2018 +1200
Branches: greasepencil-object
https://developer.blender.org/rB091db5fb9619887673c3d3b0b717776b6035d163

Assorted Cleanup/Fixes

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

M	source/blender/editors/gpencil/annotate_paint.c
M	source/blender/makesrna/intern/rna_gpencil.c
M	source/blender/nodes/composite/nodes/node_composite_cryptomatte.c

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

diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index 53b842233cf..ec645f0188c 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -458,9 +458,6 @@ static short gp_stroke_addpoint(
 			return GP_STROKEADD_NORMAL;
 	}
 	else if (p->paintmode == GP_PAINTMODE_DRAW_POLY) {
-#if 0
-		bGPDlayer *gpl = BKE_gpencil_layer_getactive(gpd);
-#endif
 		/* get pointer to destination point */
 		pt = (tGPspoint *)(gpd->runtime.sbuffer);
 
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index c2f984d2bbe..cf077999c12 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -468,8 +468,8 @@ static void rna_GPencil_stroke_point_add(bGPDstroke *stroke, int count, float pr
 		                                  sizeof(bGPDspoint) * (stroke->totpoints + count),
 		                                  "gp_stroke_points");
 		stroke->dvert = MEM_recallocN_id(stroke->dvert,
-										  sizeof(MDeformVert) * (stroke->totpoints + count),
-										  "gp_stroke_weight");
+		                                  sizeof(MDeformVert) * (stroke->totpoints + count),
+		                                  "gp_stroke_weight");
 
 		/* init the pressure and strength values so that old scripts won't need to
 		 * be modified to give these initial values...
diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
index bf9ab4a5064..af988c0df39 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
@@ -37,7 +37,7 @@
 
 /* this is taken from the cryptomatte specification 1.0 */
 
-static inline float hash_to_float(uint32_t hash)
+BLI_INLINE float hash_to_float(uint32_t hash)
 {
 	uint32_t mantissa = hash & ((1 << 23) - 1);
 	uint32_t exponent = (hash >> 23) & ((1 << 8) - 1);



More information about the Bf-blender-cvs mailing list