Attachment #91808 for bug #139435

Lines 54-60 Link Here

(-)./source/Jahshaka/JahCore/jahobjects/coreeffects.h.orig (-2 / +2 lines)
54	NOT_A_CATEGORY	54	NOT_A_CATEGORY
55	};	55	};
56		56
57	static std::string& EffectInfo::getEffectCategoryName(EFFECT_CATEGORY category);	57	static std::string& getEffectCategoryName(EFFECT_CATEGORY category);
58		58
59	// Should replace the FxCategory above	59	// Should replace the FxCategory above
60	enum EFFECT_TYPE	60	enum EFFECT_TYPE
Lines 96-102 Link Here
96	NOT_A_TYPE	96	NOT_A_TYPE
97	};	97	};
98		98
99	static std::string& EffectInfo::getEffectTypeName(EFFECT_TYPE type);	99	static std::string& getEffectTypeName(EFFECT_TYPE type);
100		100
101	protected:	101	protected:
102	EFFECT_TYPE m_type;	102	EFFECT_TYPE m_type;

Lines 42-49 Link Here

(-)./source/Jahshaka/JahCore/jahobjects/coreobject.h.orig (-2 / +2 lines)
42	bool isChromaKeyLayer() { return m_is_chroma_key_layer; }	42	bool isChromaKeyLayer() { return m_is_chroma_key_layer; }
43	void setCategory(ObjectCategory::TYPE category) { objtype = category; }	43	void setCategory(ObjectCategory::TYPE category) { objtype = category; }
44	ObjectCategory::TYPE getCategory() { return objtype; }	44	ObjectCategory::TYPE getCategory() { return objtype; }
45	EffectInfo::EFFECT_CATEGORY JahLayer::getEffectCategory();	45	EffectInfo::EFFECT_CATEGORY getEffectCategory();
46	EffectInfo::EFFECT_CATEGORY JahLayer::getPluginEffectCategory();	46	EffectInfo::EFFECT_CATEGORY getPluginEffectCategory();
47		47
48	void setIsChromaKeyLayer(bool flag);	48	void setIsChromaKeyLayer(bool flag);
49	int getEnabledEffectCount();	49	int getEnabledEffectCount();

Return to bug 139435