[Bf-blender-cvs] [f79d40eff27] temp-greasepencil-object-stacksplit: Fix typo errors

Antonio Vazquez noreply at git.blender.org
Sun Jun 17 13:39:42 CEST 2018


Commit: f79d40eff2749b2fbee777a0a4988d42a9c46cf0
Author: Antonio Vazquez
Date:   Sun Jun 17 13:39:35 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rBf79d40eff2749b2fbee777a0a4988d42a9c46cf0

Fix typo errors

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

M	source/blender/editors/object/CMakeLists.txt
M	source/blender/editors/object/object_gpencil_modifier.c
M	source/blender/makesrna/RNA_access.h

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

diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 3e71e54a6a6..941a7109d1c 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -31,6 +31,7 @@ set(INC
 	../../makesdna
 	../../makesrna
 	../../modifiers
+	../../gpencil_modifiers
 	../../python
 	../../render/extern/include
 	../../windowmanager
diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c
index b70305cd94b..cc9d397f9b4 100644
--- a/source/blender/editors/object/object_gpencil_modifier.c
+++ b/source/blender/editors/object/object_gpencil_modifier.c
@@ -430,7 +430,7 @@ int edit_modifier_poll_generic(bContext *C, StructRNA *rna_type, int obtype_flag
 
 int edit_modifier_poll(bContext *C)
 {
-	return edit_modifier_poll_generic(C, &RNA_Modifier, 0);
+	return edit_modifier_poll_generic(C, &RNA_GreasePencilModifier, 0);
 }
 
 void edit_modifier_properties(wmOperatorType *ot)
@@ -446,7 +446,7 @@ int edit_modifier_invoke_properties(bContext *C, wmOperator *op)
 		return true;
 	}
 	else {
-		PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_Modifier);
+		PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_GreasePencilModifier);
 		if (ptr.data) {
 			md = ptr.data;
 			RNA_string_set(op->ptr, "modifier", md->name);
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 44833985b66..18c5158335a 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -597,6 +597,7 @@ extern StructRNA RNA_SunLamp;
 extern StructRNA RNA_SurfaceCurve;
 extern StructRNA RNA_SurfaceDeformModifier;
 extern StructRNA RNA_SurfaceModifier;
+extern StructRNA RNA_GreasePencilModifier;
 extern StructRNA RNA_BuildGreasePencilModifier;
 extern StructRNA RNA_NoiseGreasePencilModifier;
 extern StructRNA RNA_SubdivGreasePencilModifier;



More information about the Bf-blender-cvs mailing list